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 c8d86a0c..acf78546 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 @@ -12,8 +12,8 @@ and res.group_name like concat('%',#{groupNameKey},'%') and (res.leader_username like concat('%',#{mngUsernamekey},'%') or res.ass_username like concat('%',#{mngUsernamekey},'%')) - and - exists ( select 1 from xm_project_group_user gu where gu.group_id=res.id and gu.username like concat('%',#{groupUsernamekey},'%')) + and + exists ( select 1 from xm_project_group_user gu where gu.group_id=res.id and gu.username like concat('%',#{groupUsernameKey},'%')) and (res.branch_id=#{branchId} or res.crow_branch_id=#{orCrowBranchId}) 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)) 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 a952d995..ee275209 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 @@ -14,7 +14,7 @@ and g.group_name like concat('%',#{groupNameKey},'%') and (g.leader_username like concat('%',#{mngUsernamekey},'%') or g.ass_username like concat('%',#{mngUsernamekey},'%')) - and res.username like concat('%',#{groupUsernamekey},'%') + and res.username like concat('%',#{groupUsernameKey},'%') delete from xm_project_group_user where group_id = #{groupId}