From 2e89bb115815ca329c6fd54d6d987779791c657c Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期四, 30 五月 2024 22:35:37 +0800
Subject: [PATCH] 大改用户和客户

---
 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