From c88f52ed0cf4eceb12c1ad74aa019f8469cd38ab Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 20 八月 2024 18:10:01 +0800
Subject: [PATCH] 标准库新增导出功能+标准库中点击光纤大类(后端生成的id重复报错)
---
cnas-server/src/main/java/com/yuanchu/mom/service/impl/DepartmentServiceImpl.java | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/service/impl/DepartmentServiceImpl.java b/cnas-server/src/main/java/com/yuanchu/mom/service/impl/DepartmentServiceImpl.java
index 53f8b46..9292f5a 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/service/impl/DepartmentServiceImpl.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/service/impl/DepartmentServiceImpl.java
@@ -47,6 +47,7 @@
@Override
public List<DepartmentDto> selectDepartment() {
List<DepartmentDto> departments = departmentMapper.selectDepartment();
+ departments.addAll(departmentMapper.selectCustomList());
//鑾峰彇鐖惰妭鐐�
List<DepartmentDto> collect = departments.stream().filter(m -> m.getFatherId() == null).peek(
(m) -> m.setChildren(getChildren(m, departments))
@@ -89,4 +90,8 @@
return list;
}
+ @Override
+ public List<Department> selectDepartmentEnum() {
+ return departmentMapper.selectList(Wrappers.<Department>lambdaQuery().isNotNull(Department::getFatherId).select(Department::getId,Department::getName));
+ }
}
--
Gitblit v1.9.3