From a58d740c8ef15c0bafcf5d3b76abb54333c2028e Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期五, 21 十月 2022 13:34:10 +0800
Subject: [PATCH] 处理 车牌号重复 我的代办重构 导出名字
---
ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java | 52 ++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 40 insertions(+), 12 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 4c6c5a6..bb6d7fe 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
@@ -25,7 +25,6 @@
import com.ycl.utils.common.LiveTimeMillisecond;
import com.ycl.utils.common.MacUtils;
import com.ycl.utils.common.PojoUtils;
-import com.ycl.utils.common.RandomUtils;
import com.ycl.utils.redis.RedisKey;
import com.ycl.vo.user.UserVO;
import org.apache.commons.lang3.StringUtils;
@@ -77,6 +76,12 @@
private RedisService redisService;
@Resource
private UmsDepartManageMapper umsDepartManageMapper;
+ @Resource
+ UmsRoleMenuRelationMapper umsRoleMenuRelationMapper;
+ @Resource
+ AdminMenuRelationMapper adminMenuRelationMapper;
+ @Resource
+ UmsMenuMapper umsMenuMapper;
@Override
public UmsAdmin getAdminByUsername(String username) {
@@ -118,16 +123,39 @@
List<Long> ids = umsAdminParam.getRoleIds();
if (!ids.isEmpty()) {
List<UmsAdminRoleRelation> roleIds = new ArrayList<>();
- for(Long id:ids){
+ for (Long id : ids) {
UmsAdminRoleRelation urr = new UmsAdminRoleRelation();
urr.setAdminId(umsAdmin.getId());
urr.setRoleId(id);
roleIds.add(urr);
- }
+ }
umsAdminRoleRelationService.saveBatch(roleIds);
}
+ //缁戝畾鑿滃崟浜庣敤鎴�
+ if (!ids.isEmpty()) {
+ ArrayList<UmsRoleMenuRelation> umsRoleMenuRelations = new ArrayList<>();
+ for (Long id : ids) {
+ umsRoleMenuRelations.addAll(umsRoleMenuRelationMapper
+ .selectList(new LambdaQueryWrapper<UmsRoleMenuRelation>()
+ .eq(UmsRoleMenuRelation::getRoleId, id)));
+ }
+ umsRoleMenuRelations
+ .stream()
+ .map(item->item.getMenuId())
+ .collect(Collectors.toList())
+ .stream()
+ .distinct()
+ .collect(Collectors.toList())
+ .stream()
+ .forEach(item -> {
+ AdminMenuRelation adminMenuRelation = new AdminMenuRelation();
+ adminMenuRelation.setAdminId(umsAdmin.getId());
+ adminMenuRelation.setMenuId(item);
+ adminMenuRelationMapper.insert(adminMenuRelation);
+ });
+ }
//瀵圭敤鎴峰悕绯荤粺榛樿娣诲姞
- umsAdmin.setNickName(RandomUtils.getUserId(umsAdmin.getId()));
+ //umsAdmin.setNickName(RandomUtils.getUserId(umsAdmin.getId()));
baseMapper.updateById(umsAdmin);
return umsAdmin;
@@ -341,8 +369,8 @@
e.setDepartName(umsDepart.getDepartName());
}
//鑾峰彇瑙掕壊鍒楄〃
- List<UmsRole> roles = umsRoleMapper.getRoleList(e.getId());
- e.setRoles(roles);
+ List<UmsRole> roles = umsRoleMapper.getRoleList(e.getId());
+ e.setRoles(roles);
});
}
return page1;
@@ -359,11 +387,11 @@
public boolean updateStatusBatch(List<Long> ids, Integer status) {
List<UmsAdmin> users = new ArrayList<>();
for (Long id : ids) {
- UmsAdmin umsAdmin = UmsAdmin.builder().
+ UmsAdmin umsAdmin = UmsAdmin.builder().
id(id).status(status).build();
users.add(umsAdmin);
}
- updateBatchById(users,users.size());
+ updateBatchById(users, users.size());
getCacheService().delBatchAdmin(ids);
return true;
}
@@ -372,8 +400,8 @@
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());
+ 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);
@@ -387,11 +415,11 @@
QueryWrapper<UmsAdmin> wrapperUser = new QueryWrapper<>();
wrapperUser.in("id", arr);
List<UmsAdmin> adminList = baseMapper.selectList(wrapperUser);
- if (adminList == null||adminList.isEmpty()) {
+ if (adminList == null || adminList.isEmpty()) {
throw new ApiException("鏈煡璇㈠埌鐢ㄦ埛");
}
if ("02".equals(sendType)) {
- str = adminList.stream().map(UmsAdmin::getEmail).collect(Collectors.joining(","));
+ str = adminList.stream().map(UmsAdmin::getEmail).collect(Collectors.joining(","));
} else {
str = adminList.stream().map(UmsAdmin::getMobile).collect(Collectors.joining(","));
}
--
Gitblit v1.8.0