From c9bc5eb8d9d1d2c247b7a67f53ef2e9407906bd4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Fri, 10 Nov 2023 17:30:04 +0800
Subject: [PATCH] 2.0

---
 .../com/xm/core/mapper/XmGroupStateMapper.xml  |  4 ++++
 .../com/xm/core/mapper/XmGroupUserMapper.xml   | 18 ++++++++++++++++--
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/xm-core/src/main/java/com/xm/core/mapper/XmGroupStateMapper.xml b/xm-core/src/main/java/com/xm/core/mapper/XmGroupStateMapper.xml
index 3d98147f..9dbde9cd 100644
--- a/xm-core/src/main/java/com/xm/core/mapper/XmGroupStateMapper.xml
+++ b/xm-core/src/main/java/com/xm/core/mapper/XmGroupStateMapper.xml
@@ -14,4 +14,8 @@
         <!--下面双引号内可以添加默认分组，如果前端没有上传分组，将使用引号内的分组规则-->
         ${@com.mdp.Util@trimGroupBy(ew.customSqlSegment,'')}
     </select>
+
+    <update id="loadTasksToXmProjectGroupState" parameterType="String" statementType="CALLABLE">
+        {call load_tasks_to_xm_project_group_state(#{projectId,mode=IN})}
+    </update>
 </mapper>
\ No newline at end of file
diff --git a/xm-core/src/main/java/com/xm/core/mapper/XmGroupUserMapper.xml b/xm-core/src/main/java/com/xm/core/mapper/XmGroupUserMapper.xml
index 6c3a92fc..a6f14d75 100644
--- a/xm-core/src/main/java/com/xm/core/mapper/XmGroupUserMapper.xml
+++ b/xm-core/src/main/java/com/xm/core/mapper/XmGroupUserMapper.xml
@@ -3,15 +3,29 @@
 <mapper namespace="com.xm.core.mapper.XmGroupUserMapper">
 
     <select id="selectListMapByWhere" resultType="HashMap">
-        select * from xm_group_user res
+         select res.*,g.group_name,g.crow_branch_name,g.crow_branch_id,g.is_crow from xm_group_user res left join xm_group g on res.group_id=g.id
         <where>
             ${@com.mdp.Util@trimWhere(ew.customSqlSegment)}
             <!--下面可以添加更多查询条件，正常的if 条件都是支持的-->
 
         </where>
         <!--下面双引号内可以添加默认排序，如果前端没有上传排序，将使用引号内的排序规则-->
-        ${@com.mdp.Util@trimOrderBy(ew.customSqlSegment,'')}
+        ${@com.mdp.Util@trimOrderBy(ew.customSqlSegment,'order by res.seq_no asc')}
         <!--下面双引号内可以添加默认分组，如果前端没有上传分组，将使用引号内的分组规则-->
         ${@com.mdp.Util@trimGroupBy(ew.customSqlSegment,'')}
     </select>
+
+    <!-- 通过条件查询获取数据列表 不分页 返回 list<Object> -->
+    <select id="selectGroupUserListByProjectId" parameterType="String" resultType="com.xm.core.entity.XmGroupUser">
+        select * from xm_group_user res
+        <where>
+            exists( select 1 from xm_group g where g.id=res.group_id and g.project_id=#{projectId})
+        </where>
+    </select>
+    <select id="selectGroupUserListByProductId" parameterType="String" resultType="com.xm.core.entity.XmGroupUser">
+        select * from xm_group_user res
+        <where>
+            exists( select 1 from xm_group g where g.id=res.group_id and g.product_id=#{productId})
+        </where>
+    </select>
 </mapper>
\ No newline at end of file