From b9e7a0261443ca41b80108b9fef555093f20bb8b Mon Sep 17 00:00:00 2001
From: mg <maokecheng@163.com>
Date: 星期五, 14 十月 2022 16:48:13 +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 | 24 +++++++++++++++++++++++-
1 files changed, 23 insertions(+), 1 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 c4f418f..86a520b 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
@@ -12,6 +12,7 @@
import com.ycl.dto.UpdateAdminPasswordParam;
import com.ycl.entity.depart.UmsDepart;
import com.ycl.entity.user.*;
+import com.ycl.exception.ApiException;
import com.ycl.exception.Asserts;
import com.ycl.mapper.user.*;
import com.ycl.service.depart.UmsDepartService;
@@ -80,6 +81,8 @@
UmsRoleMenuRelationMapper umsRoleMenuRelationMapper;
@Resource
AdminMenuRelationMapper adminMenuRelationMapper;
+ @Resource
+ UmsMenuMapper umsMenuMapper;
@Override
public UmsAdmin getAdminByUsername(String username) {
@@ -147,10 +150,11 @@
.selectList(new LambdaQueryWrapper<UmsRoleMenuRelation>()
.eq(UmsRoleMenuRelation::getRoleId, maxId))
.stream()
- .forEach(item->{
+ .forEach(item -> {
AdminMenuRelation adminMenuRelation = new AdminMenuRelation();
adminMenuRelation.setAdminId(umsAdmin.getId());
adminMenuRelation.setMenuId(item.getMenuId());
+ adminMenuRelation.setSort(umsMenuMapper.selectOne(new LambdaQueryWrapper<UmsMenu>().eq(UmsMenu::getId, item.getMenuId())).getSort());
adminMenuRelationMapper.insert(adminMenuRelation);
});
}
@@ -407,4 +411,22 @@
List<UmsAdmin> adminList = baseMapper.selectList(wrapperUser);
return adminList;
}
+
+ @Override
+ public String getTargetTo(String ids, String sendType) {
+ String str = null;
+ String[] arr = ids.split(",");
+ QueryWrapper<UmsAdmin> wrapperUser = new QueryWrapper<>();
+ wrapperUser.in("id", arr);
+ List<UmsAdmin> adminList = baseMapper.selectList(wrapperUser);
+ if (adminList == null || adminList.isEmpty()) {
+ throw new ApiException("鏈煡璇㈠埌鐢ㄦ埛");
+ }
+ if ("02".equals(sendType)) {
+ str = adminList.stream().map(UmsAdmin::getEmail).collect(Collectors.joining(","));
+ } else {
+ str = adminList.stream().map(UmsAdmin::getMobile).collect(Collectors.joining(","));
+ }
+ return str;
+ }
}
--
Gitblit v1.8.0