From 0c4b37ef2de376e8d02fe81a6af384929579d662 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期六, 18 三月 2023 11:30:37 +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 | 4 +++-
1 files changed, 3 insertions(+), 1 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 a008173..837d69e 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
@@ -148,7 +148,9 @@
.map(item -> {
UmsDepartDto umsDepartDto = new UmsDepartDto();
umsDepartDto.setId(item.getId());
- umsDepartDto.setDepartType(item.getDepartType());
+ umsDepartDto.setParentDepartName(item.getDepartName());
+ String departType = sccgDepartMapper.getDepartType(item.getDepartType());
+ umsDepartDto.setDepartType(departType);
UmsDepart umsDepartFather = sccgDepartMapper.selectOne(new LambdaQueryWrapper<UmsDepart>().eq(UmsDepart::getDepartName, item.getId()));
if (Objects.isNull(umsDepartFather)){
umsDepartDto.setParentDepartName("");
--
Gitblit v1.8.0