From ad55f273c1675be42ef38681bea3cf2ad363c56c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Sun, 6 Mar 2022 16:27:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=8A=82=E7=82=B9=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E3=80=81=E6=A0=87=E7=AD=BE=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mybatis/mapper/xm/core/dao/XmProjectGroupMapper.xml    | 7 +++++--
 .../mapper/xm/core/dao/XmProjectGroupUserMapper.xml        | 5 ++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectGroupMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectGroupMapper.xml
index e7bf5a59..95d0ae4a 100644
--- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectGroupMapper.xml
+++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectGroupMapper.xml
@@ -4,14 +4,17 @@
 	
 	
 	<!--开始 自定sql函数区域 请在此区域添加自定义函数,其它区域尽量不要动，因为代码随时重新生成 -->
-
     <sql id="whereForMap">
          <if test=" ids != null">  and (res.id) in
              <foreach collection="ids" item="item" index="index" open="(" separator="," close=")" >
                  ( #{item})
              </foreach>
          </if>
-        <if test="key != null and key !='' ">    and res.group_name like concat('%',#{key},'%')   </if>
+        <if test="groupNameKey != null and groupNameKey !='' ">    and res.group_name like concat('%',#{groupNameKey},'%')   </if>
+		<if test="mngUsernamekey != null and mngUsernamekey !='' ">    and (res.leader_username like concat('%',#{mngUsernamekey},'%') or res.ass_username like  like concat('%',#{mngUsernamekey},'%'))  </if>
+		<if test="groupUsernamekey != null and groupUsernamekey !='' ">    and
+			exists ( select 1 from xm_project_group_user gu where gu.group_id=res.id and  gu.username like concat('%',#{groupUsernamekey},'%'))
+		</if>
 		<if test="orCrowBranchId!=null and orCrowBranchId!=''"> and (res.branch_id=#{branchId} or res.crow_branch_id=#{orCrowBranchId})</if>
 		<if test="iterationId!=null and iterationId!=''"> and exists ( select 1 from xm_iteration_product_link ipl left join xm_product_project_link ppl on ipl.product_id=ppl.product_id and (ipl.product_id=res.product_id or ppl.project_id = res.project_id))</if>
     </sql>
diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectGroupUserMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectGroupUserMapper.xml
index 4a889b1a..18a25f90 100644
--- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectGroupUserMapper.xml
+++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectGroupUserMapper.xml
@@ -11,7 +11,10 @@
                 ( #{item.groupId},  #{item.userid})
              </foreach>
          </if>
-        <if test="key != null and key !='' ">       </if>
+
+		<if test="groupNameKey != null and groupNameKey !='' ">    and g.group_name like concat('%',#{groupNameKey},'%')   </if>
+		<if test="mngUsernamekey != null and mngUsernamekey !='' ">    and (g.leader_username like concat('%',#{mngUsernamekey},'%') or g.ass_username like  like concat('%',#{mngUsernamekey},'%'))  </if>
+		<if test="groupUsernamekey != null and groupUsernamekey !='' ">    and res.username like concat('%',#{groupUsernamekey},'%') </if>
     </sql>
 	<delete id="deleteByGroupId" parameterType="com.xm.core.entity.XmProjectGroupUser">
 		delete from xm_project_group_user where group_id = #{groupId}