From b4d2dbd68ed39bcf58c8afe50d7f5c06f14c237c Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期一, 27 二月 2023 09:51:55 +0800
Subject: [PATCH] bug修改
---
ycl-common/src/main/java/com/ycl/service/depart/impl/UmsDepartServiceImpl.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 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 bc40ae3..7a04233 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
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.entity.depart.UmsDepart;
+import com.ycl.entity.user.UmsAdmin;
import com.ycl.enums.common.ResultCode;
import com.ycl.exception.ApiException;
import com.ycl.mapper.depart.UmsDepartMapper;
@@ -112,10 +113,10 @@
// 2.缁勮鎴愮埗瀛愮殑鏍戝瀷缁撴瀯
// 2.1銆佹壘鍒版墍鏈夌殑涓�绾х綉鏍�:浣跨敤jdk8鐨剆tream娴佽繘琛岃繃婊�
- List<UmsDepart> collect = list.stream().filter(griddingEntity -> {
+ List<UmsDepart> collect = list.stream().filter(item ->
//鍒嗙被鐖秈d涓�0灏辫〃绀鸿缃戞牸涓� 涓�绾х綉鏍�
- return griddingEntity.getParentId() == 0;
- }).map(item -> {
+ item.getParentId() == 0
+ ).map(item -> {
// 鎵惧埌瀛愮綉鏍� set杩沜hildren灞炴�т腑
item.setChildren(getChildrens(item, list));
return item;
@@ -146,6 +147,15 @@
}
}
+ @Override
+ public List<UmsAdmin> selectSurplusUser() {
+ return sccgDepartMapper.selectSurplusUser();
+ }
+
+ @Override
+ public List<UmsAdmin> selectSurplusUserAndExistUser(Long id) {
+ return sccgDepartMapper.selectSurplusUserAndExistUser(id);
+ }
/**
* 鍒╃敤閫掑綊灏嗘渶鍚庝竴绾х┖闆嗗悎鍙樹负null锛屽墠绔仈绾ч�夋嫨鍣ㄦ渶鍚庢墠涓嶄細鍑虹幇 鏆傛棤鏁版嵁鐨刡ug
--
Gitblit v1.8.0