Merge remote-tracking branch 'origin/0205cmt' into 0205cmt

0927cmt
zhaoyu 2024-06-19 11:36:31 +08:00
commit 8b456819e7
1 changed files with 5 additions and 1 deletions

View File

@ -280,7 +280,11 @@
and f.ACCIDENTS LIKE CONCAT(CONCAT('%', #{pd.BIANMA}),'%') and f.ACCIDENTS LIKE CONCAT(CONCAT('%', #{pd.BIANMA}),'%')
</if> </if>
<if test="pd.gkzrName != null and pd.gkzrName != ''"> <if test="pd.gkzrName != null and pd.gkzrName != ''">
and u.NAME LIKE CONCAT(CONCAT('%', #{pd.gkzrName}),'%') and (
u.NAME LIKE CONCAT(CONCAT('%', #{pd.gkzrName}),'%')
or
f.USER_ID LIKE CONCAT(CONCAT('%', #{pd.gkzrName}),'%')
)
</if> </if>
order by f.CREATTIME desc, f.SORT asc,f.OPERATTIME asc ,RISKUNITNAME desc ,PARTSNAME desc order by f.CREATTIME desc, f.SORT asc,f.OPERATTIME asc ,RISKUNITNAME desc ,PARTSNAME desc
</select> </select>