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/depart/impl/UmsDepartServiceImpl.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/ycl-common/src/main/java/com/ycl/service/depart/impl/UmsDepartServiceImpl.java b/ycl-common/src/main/java/com/ycl/service/depart/impl/UmsDepartServiceImpl.java
index 9865d23..801bdf2 100644
--- a/ycl-common/src/main/java/com/ycl/service/depart/impl/UmsDepartServiceImpl.java
+++ b/ycl-common/src/main/java/com/ycl/service/depart/impl/UmsDepartServiceImpl.java
@@ -63,6 +63,7 @@
}
UmsDepart depart = new UmsDepart();
BeanUtils.copyProperties(addDepartVO, depart);
+ depart.setStatus(Short.valueOf("1"));
umsDepartService.save(depart);
addDepartVO.getDepartManagerList()
.forEach(item -> {
@@ -121,7 +122,7 @@
@Override
public List<UmsDepart> tree() {
// 1.鏌ュ嚭鎵�鏈夌綉鏍�
- List<UmsDepart> list = list();
+ List<UmsDepart> list = baseMapper.selectDepartList();
// 2.缁勮鎴愮埗瀛愮殑鏍戝瀷缁撴瀯
// 2.1銆佹壘鍒版墍鏈夌殑涓�绾х綉鏍�:浣跨敤jdk8鐨剆tream娴佽繘琛岃繃婊�
@@ -167,7 +168,7 @@
List<AdminDepartDTO.UserInfoDTO> userInfoDTOS = umsAdminDeparts.stream().map(a -> {
AdminDepartDTO.UserInfoDTO userInfoDTO = new AdminDepartDTO.UserInfoDTO();
userInfoDTO.setUserId(a.getUserId());
- userInfoDTO.setUsername(umsAdminService.getById(a.getUserId()).getUsername());
+// userInfoDTO.setUsername(umsAdminService.getById(a.getUserId()).getUsername());
return userInfoDTO;
}).collect(Collectors.toList());
record.setUserInfoDTOS(userInfoDTOS);
--
Gitblit v1.8.0