FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop_master' into develop_3

Browse Source
This commit is contained in:
zhaokaiyao@91isoft.com
2021-09-16 09:11:51 +08:00
parent d6331ab155 bcf47c93e1
commit dcc461e041
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/resources/mybatis/mapper/sarInstitution/TsInstitutionMapper.xml
+1 -1
View File
@@ -50,7 +50,7 @@
<if test="userName != null"> <if test="userName != null">
where u.uname like concat('%','${userName}','%') where u.uname like concat('%','${userName}','%') or u.account like concat('%','${userName}','%')
</if> </if>
</select> </select>
adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml
+2
View File
@@ -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>