|
@@ -57,7 +57,7 @@
|
|
|
</if>
|
|
</if>
|
|
|
<if test="queryPage.merc != null and queryPage.merc != ''">
|
|
<if test="queryPage.merc != null and queryPage.merc != ''">
|
|
|
and (
|
|
and (
|
|
|
- info.merc_id = #{queryPage.merc} or info.merc_code = #{queryPage.merc} or LOCATE(#{queryPage.merc}, mr.merc_name) > 0
|
|
|
|
|
|
|
+ info.merc_id = #{queryPage.merc} or info.merc_code = #{queryPage.merc} or LOCATE(#{queryPage.merc}, mr.name) > 0
|
|
|
)
|
|
)
|
|
|
</if>
|
|
</if>
|
|
|
<if test="queryPage.appUpmVersion != null and queryPage.appUpmVersion != ''">
|
|
<if test="queryPage.appUpmVersion != null and queryPage.appUpmVersion != ''">
|
