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_master

Browse Source
This commit is contained in:
yuezhihang
2022-03-15 16:32:59 +08:00
parent 7c57087964 0f9d226a23
commit 3ecfc336c8
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/resources/mybatis/mapper/workGroup/WorkGroupMapper.xml
+1 -5
View File
@@ -11,8 +11,6 @@
work_people_id AS workPeopleId work_people_id AS workPeopleId
FROM FROM
work_group work_group
<where> <where>
<if test="queryCondition.leaderName != null and queryCondition.leaderName != ''"> <if test="queryCondition.leaderName != null and queryCondition.leaderName != ''">
work_leader_id REGEXP ( work_leader_id REGEXP (
@@ -24,12 +22,10 @@
UNAME LIKE CONCAT('%', #{queryCondition.leaderName}, '%') UNAME LIKE CONCAT('%', #{queryCondition.leaderName}, '%')
) )
</if> </if>
<if test="ew != null"> <if test="ew != null">
<if test="ew.nonEmptyOfWhere"> <if test="ew.nonEmptyOfWhere">
AND AND work_group.work_group_name LIKE CONCAT('%',#{queryCondition.workGroupName},'%')
</if> </if>
${ew.sqlSegment}
</if> </if>
</where> </where>