From 3107f05166875ee54b50d95f2d0ddd0b742d3a42 Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期一, 10 十月 2022 17:31:26 +0800
Subject: [PATCH] 部门查询status不对

---
 ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java |   23 ++++++++++++++++-------
 1 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java b/ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java
index a88c754..ca8979a 100644
--- a/ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java
+++ b/ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java
@@ -13,12 +13,8 @@
 import com.ycl.entity.depart.UmsDepart;
 import com.ycl.entity.user.*;
 import com.ycl.exception.Asserts;
-import com.ycl.mapper.user.UmsAdminLoginLogMapper;
-import com.ycl.mapper.user.UmsAdminMapper;
-import com.ycl.mapper.user.UmsResourceMapper;
-import com.ycl.mapper.user.UmsRoleMapper;
+import com.ycl.mapper.user.*;
 import com.ycl.service.depart.UmsDepartService;
-import com.ycl.service.user.UmsDepartManageService;
 import com.ycl.service.redis.RedisService;
 import com.ycl.service.user.UmsAdminCacheService;
 import com.ycl.service.user.UmsAdminRoleRelationService;
@@ -53,6 +49,7 @@
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 鍚庡彴绠$悊鍛樼鐞哠ervice瀹炵幇绫�
@@ -76,9 +73,9 @@
     @Resource
     private UmsDepartService departService;
     @Resource
-    private UmsDepartManageService umsAdminDepartService;
-    @Resource
     private RedisService redisService;
+    @Resource
+    private UmsDepartManageMapper umsDepartManageMapper;
 
     @Override
     public UmsAdmin getAdminByUsername(String username) {
@@ -369,4 +366,16 @@
         getCacheService().delBatchAdmin(ids);
         return true;
     }
+
+    @Override
+    public List<UmsAdmin> getDepartUser(Long departId) {
+        QueryWrapper<UmsDepartManage> wrapper = new QueryWrapper<>();
+        wrapper.lambda().eq(UmsDepartManage::getDepartId, departId);
+        List<UmsDepartManage>  list = umsDepartManageMapper.selectList(wrapper);
+        List<Long> userIds  = list.stream().map(UmsDepartManage::getUserId).collect(Collectors.toList());
+        QueryWrapper<UmsAdmin> wrapperUser = new QueryWrapper<>();
+        wrapperUser.in("id", userIds);
+        List<UmsAdmin> adminList = baseMapper.selectList(wrapperUser);
+        return adminList;
+    }
 }

--
Gitblit v1.8.0