From 087991c76f078defe5eb55d84223021b4199fb3d Mon Sep 17 00:00:00 2001 From: zss <zss@example.com> Date: 星期一, 17 二月 2025 11:22:50 +0800 Subject: [PATCH] 设备模块修改bug --- 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