From 42c8702cd84b4262cca0ea1477ebed060088d2a9 Mon Sep 17 00:00:00 2001
From: zhangjinli <zhangjinli_808@163.com>
Date: Mon, 27 Jun 2022 18:10:45 +0800
Subject: [PATCH] zh

---
 .../project0512/controller/manage/UserController.java  |  7 +++++++
 .../mapper/QywxDepartmentGroupLinkMapper.java          | 10 ++++++++++
 .../service/IQywxDepartmentGroupLinkService.java       |  2 ++
 .../QywxDepartmentGroupLinkServiceImpl.java            |  3 +++
 .../resources/mapper/QywxDepartmentGroupLinkMapper.xml |  1 +
 5 files changed, 23 insertions(+)

diff --git a/src/main/java/com/zh/project0512/controller/manage/UserController.java b/src/main/java/com/zh/project0512/controller/manage/UserController.java
index 95bda54..8df9ff4 100644
--- a/src/main/java/com/zh/project0512/controller/manage/UserController.java
+++ b/src/main/java/com/zh/project0512/controller/manage/UserController.java
@@ -181,6 +181,13 @@ public class UserController {
         return Result.success(qywxDepartmentGroupLinkService.departmentList(param.getId()));
     }
 
+    @Operation(summary = "部门级别详情2")
+    @PostMapping("/departmentGroupDet2")
+    @AdminTokenValid
+    public Result departmentGroupDet2(@Validated @RequestBody DelDGParam param) {
+        return Result.success(qywxDepartmentGroupLinkService.departmentList2(param.getId()));
+    }
+
     @Operation(summary = "部门级别删除部门",description = "批量删除部门id")
     @PostMapping("/departmentGroupDel")
     @AdminTokenValid
diff --git a/src/main/java/com/zh/project0512/mapper/QywxDepartmentGroupLinkMapper.java b/src/main/java/com/zh/project0512/mapper/QywxDepartmentGroupLinkMapper.java
index f8f36fa..4f429a4 100644
--- a/src/main/java/com/zh/project0512/mapper/QywxDepartmentGroupLinkMapper.java
+++ b/src/main/java/com/zh/project0512/mapper/QywxDepartmentGroupLinkMapper.java
@@ -26,6 +26,16 @@ public interface QywxDepartmentGroupLinkMapper extends BaseMapper<QywxDepartment
         "</script>")
     void groupAddDepartment(Integer groupId, List<Integer> departmentIdList, LocalDateTime creatAt);
     List<Map> departmentList(Integer groupId);
+    @Select("    SELECT t1.departmentId,t1.creatAt,t3.name as departmentName\n" +
+        "    ,t4.id as userId,t4.name as userName\n" +
+        "    from qywxDepartmentGroupLink as t1\n" +
+        "    LEFT JOIN qywxDepartmentGroup as t2 on t1.groupId = t2.id\n" +
+        "    INNER JOIN qywxDepartment as t3 on t3.departmentId = t1.departmentId\n" +
+        "    INNER JOIN user as t4 on t4.main_department = t1.departmentId\n" +
+        "    where t2.id in (2,4)\n" +
+        "    GROUP BY userName\n" +
+        "    ORDER BY creatAt DESC")
+    List<Map> departmentList2(Integer groupId);
     @Select("SELECT t1.departmentId\n" +
         "from qywxDepartmentGroupLink as t1\n" +
         "LEFT JOIN qywxDepartmentGroup as t2 on t1.groupId = t2.id\n" +
diff --git a/src/main/java/com/zh/project0512/service/IQywxDepartmentGroupLinkService.java b/src/main/java/com/zh/project0512/service/IQywxDepartmentGroupLinkService.java
index 5b06f99..2b4e338 100644
--- a/src/main/java/com/zh/project0512/service/IQywxDepartmentGroupLinkService.java
+++ b/src/main/java/com/zh/project0512/service/IQywxDepartmentGroupLinkService.java
@@ -18,5 +18,7 @@ import java.util.Map;
 public interface IQywxDepartmentGroupLinkService extends IService<QywxDepartmentGroupLink> {
     void groupAddDepartment(Integer groupId, List<Integer> departmentIdList, LocalDateTime creatAt);
     List<Map> departmentList(Integer groupId);
+    List<Map> departmentList2(Integer groupId);
     List<Integer> departmentIdList(List<Integer> groupIdList);
+
 }
diff --git a/src/main/java/com/zh/project0512/serviceImpl/QywxDepartmentGroupLinkServiceImpl.java b/src/main/java/com/zh/project0512/serviceImpl/QywxDepartmentGroupLinkServiceImpl.java
index 3d45ed4..0a6eef6 100644
--- a/src/main/java/com/zh/project0512/serviceImpl/QywxDepartmentGroupLinkServiceImpl.java
+++ b/src/main/java/com/zh/project0512/serviceImpl/QywxDepartmentGroupLinkServiceImpl.java
@@ -31,6 +31,9 @@ public class QywxDepartmentGroupLinkServiceImpl extends ServiceImpl<QywxDepartme
     public List<Map> departmentList(Integer groupId){
        return qywxDepartmentGroupLinkMapper.departmentList(groupId);
     }
+    public List<Map> departmentList2(Integer groupId){
+        return qywxDepartmentGroupLinkMapper.departmentList2(groupId);
+    }
     public List<Integer> departmentIdList(List<Integer> groupIdList){
         return qywxDepartmentGroupLinkMapper.departmentIdList(groupIdList);
     }
diff --git a/src/main/resources/mapper/QywxDepartmentGroupLinkMapper.xml b/src/main/resources/mapper/QywxDepartmentGroupLinkMapper.xml
index 0588722..500672d 100644
--- a/src/main/resources/mapper/QywxDepartmentGroupLinkMapper.xml
+++ b/src/main/resources/mapper/QywxDepartmentGroupLinkMapper.xml
@@ -24,4 +24,5 @@
         ,userName
         ORDER BY creatAt DESC
     </select>
+
 </mapper>