From 71f3101370c3db0ec00178d51a723816c9bcddbd Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期六, 18 三月 2023 17:42:14 +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 | 12 +++++++-----
1 files changed, 7 insertions(+), 5 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 37c074b..71a2f27 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
@@ -145,17 +145,19 @@
List<UmsDepart> umsDeparts = sccgDepartMapper.selectDepartList();
List<UmsDepartDto> res = umsDeparts
.stream()
- .map(umsDepart -> {
+ .map(item -> {
UmsDepartDto umsDepartDto = new UmsDepartDto();
- umsDepartDto.setId(umsDepart.getId());
- umsDepartDto.setDepartType(umsDepart.getDepartType());
- UmsDepart umsDepartFather = sccgDepartMapper.selectOne(new LambdaQueryWrapper<UmsDepart>().eq(UmsDepart::getDepartName, umsDepart.getId()));
+ umsDepartDto.setId(item.getId());
+ umsDepartDto.setDepartTypeName(item.getDepartName());
+ String departType = sccgDepartMapper.getDepartType(item.getDepartType());
+ umsDepartDto.setDepartType(departType);
+ UmsDepart umsDepartFather = sccgDepartMapper.selectOne(new LambdaQueryWrapper<UmsDepart>().eq(UmsDepart::getId, item.getParentId()));
if (Objects.isNull(umsDepartFather)){
umsDepartDto.setParentDepartName("");
}else {
umsDepartDto.setParentDepartName(umsDepartFather.getDepartName());
}
- umsDepartDto.setDepartDes(umsDepart.getDepartDes());
+ umsDepartDto.setDepartDes(item.getDepartDes());
return umsDepartDto;
}).collect(Collectors.toList());
return res;
--
Gitblit v1.8.0