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

2022-03-15 16:32:59 +08:00
parent 7c57087964 0f9d226a23
commit 3ecfc336c8
1 changed files with 1 additions and 5 deletions
@@ -11,8 +11,6 @@
        	work_people_id AS workPeopleId
        FROM
        	work_group
-
-
        <where>
            <if test="queryCondition.leaderName != null and queryCondition.leaderName != ''">
                work_leader_id REGEXP (
@@ -24,12 +22,10 @@
                UNAME LIKE CONCAT('%', #{queryCondition.leaderName}, '%')
                )
            </if>
-
            <if test="ew != null">
                <if test="ew.nonEmptyOfWhere">
-                    AND
+                    AND work_group.work_group_name LIKE CONCAT('%',#{queryCondition.workGroupName},'%')
                </if>
-                ${ew.sqlSegment}
            </if>

        </where>