From afbc1b29cd2ce92484f1be1e533ee075dbe08ff2 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期一, 10 十月 2022 14:46:01 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server

---
 ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java |   59 +++++++++++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 49 insertions(+), 10 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 fd79564..a88c754 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
@@ -10,17 +10,17 @@
 import com.ycl.bo.AdminUserDetails;
 import com.ycl.dto.UmsAdminParam;
 import com.ycl.dto.UpdateAdminPasswordParam;
-import com.ycl.entity.depart.SccgDepart;
+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.service.depart.SccgDepartService;
+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.UmsDepartManageService;
 import com.ycl.service.user.UmsAdminRoleRelationService;
 import com.ycl.service.user.UmsAdminService;
 import com.ycl.utils.JwtTokenUtil;
@@ -74,7 +74,7 @@
     @Resource
     private UmsResourceMapper umsResourceMapper;
     @Resource
-    private SccgDepartService sccgDepartService;
+    private UmsDepartService departService;
     @Resource
     private UmsDepartManageService umsAdminDepartService;
     @Resource
@@ -115,6 +115,19 @@
         String encodePassword = passwordEncoder.encode(umsAdmin.getPassword());
         umsAdmin.setPassword(encodePassword);
         baseMapper.insert(umsAdmin);
+
+        //娣诲姞瑙掕壊鎺堟潈
+        List<Long> ids = umsAdminParam.getRoleIds();
+        if (!ids.isEmpty()) {
+            List<UmsAdminRoleRelation> roleIds = new ArrayList<>();
+            for(Long id:ids){
+                UmsAdminRoleRelation urr = new UmsAdminRoleRelation();
+                urr.setAdminId(umsAdmin.getId());
+                urr.setRoleId(id);
+                roleIds.add(urr);
+             }
+            umsAdminRoleRelationService.saveBatch(roleIds);
+        }
         //瀵圭敤鎴峰悕绯荤粺榛樿娣诲姞
         umsAdmin.setNickName(RandomUtils.getUserId(umsAdmin.getId()));
         baseMapper.updateById(umsAdmin);
@@ -306,14 +319,17 @@
         int current = pageUserVO.getCurrent();
         Page<UmsAdmin> page = new Page<>(current, pageSize);
         LambdaQueryWrapper<UmsAdmin> queryWrapper = new LambdaQueryWrapper<>();
+
+        if (StringUtils.isNotBlank(pageUserVO.getKeyword())) {
+            queryWrapper.like(UmsAdmin::getUsername, pageUserVO.getKeyword())
+                    .or().like(UmsAdmin::getNickName, pageUserVO.getKeyword())
+                    .or().like(UmsAdmin::getMobile, pageUserVO.getKeyword());
+        }
         if (StringUtils.isNotBlank(pageUserVO.getJobTitle())) {
             queryWrapper.eq(UmsAdmin::getJobTitle, pageUserVO.getJobTitle());
         }
         if (PojoUtils.Vo.isUsefulSearchParam(pageUserVO.getUserType())) {
             queryWrapper.eq(UmsAdmin::getUserType, pageUserVO.getUserType());
-        }
-        if (StringUtils.isNotBlank(pageUserVO.getMobile())) {
-            queryWrapper.like(UmsAdmin::getMobile, pageUserVO.getMobile());
         }
         if (PojoUtils.Vo.isUsefulSearchParam(pageUserVO.getDepartmentId())) {
             queryWrapper.eq(UmsAdmin::getDepartmentId, pageUserVO.getDepartmentId());
@@ -322,12 +338,35 @@
         List<UmsAdmin> records = page1.getRecords();
         if (CollUtil.isNotEmpty(records)) {
             records.forEach(e -> {
-                SccgDepart sccgDepart = sccgDepartService.getById(e.getDepartmentId());
-                if (null != sccgDepart) {
-                    e.setDepartName(sccgDepart.getDepartName());
+                UmsDepart umsDepart = departService.getById(e.getDepartmentId());
+                if (null != umsDepart) {
+                    e.setDepartName(umsDepart.getDepartName());
                 }
+                //鑾峰彇瑙掕壊鍒楄〃
+               List<UmsRole> roles = umsRoleMapper.getRoleList(e.getId());
+               e.setRoles(roles);
             });
         }
         return page1;
     }
+
+    @Override
+    public boolean deleteBatch(List<Long> ids) {
+        boolean success = removeByIds(ids);
+        getCacheService().delBatchAdmin(ids);
+        return success;
+    }
+
+    @Override
+    public boolean updateStatusBatch(List<Long> ids, Integer status) {
+        List<UmsAdmin> users = new ArrayList<>();
+        for (Long id : ids) {
+            UmsAdmin umsAdmin =  UmsAdmin.builder().
+                    id(id).status(status).build();
+            users.add(umsAdmin);
+        }
+        updateBatchById(users,users.size());
+        getCacheService().delBatchAdmin(ids);
+        return true;
+    }
 }

--
Gitblit v1.8.0