Merge remote-tracking branch 'origin/develop_1' into develop_1
This commit is contained in:
+2
@@ -50,6 +50,7 @@
|
|||||||
</if>
|
</if>
|
||||||
<if test="sar.standSerialNumber != null and sar.standSerialNumber != '' ">
|
<if test="sar.standSerialNumber != null and sar.standSerialNumber != '' ">
|
||||||
and STAND_SERIAL_NUMBER like concat(concat('%',#{sar.standSerialNumber}),'%')
|
and STAND_SERIAL_NUMBER like concat(concat('%',#{sar.standSerialNumber}),'%')
|
||||||
|
or sar_stand_unqualified.STAND_NAME like concat(concat('%',#{sar.standSerialNumber}),'%')
|
||||||
</if>
|
</if>
|
||||||
limit #{start},#{end}
|
limit #{start},#{end}
|
||||||
</select>
|
</select>
|
||||||
@@ -73,6 +74,7 @@
|
|||||||
</if>
|
</if>
|
||||||
<if test="sar.standSerialNumber != null and sar.standSerialNumber != '' ">
|
<if test="sar.standSerialNumber != null and sar.standSerialNumber != '' ">
|
||||||
and STAND_SERIAL_NUMBER like concat(concat('%',#{sar.standSerialNumber}),'%')
|
and STAND_SERIAL_NUMBER like concat(concat('%',#{sar.standSerialNumber}),'%')
|
||||||
|
or sar_stand_unqualified.STAND_NAME like concat(concat('%',#{sar.standSerialNumber}),'%')
|
||||||
</if>
|
</if>
|
||||||
</select>
|
</select>
|
||||||
</mapper>
|
</mapper>
|
||||||
|
|||||||
Reference in New Issue
Block a user