From a5b1bad21ba279ade3954852a5e281e9086042f0 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 26 十一月 2024 15:22:52 +0800
Subject: [PATCH] 前端联调修改2.0
---
cnas-server/src/main/java/com/yuanchu/mom/service/impl/DepartmentServiceImpl.java | 49 ++++++++++++++-----------------------------------
1 files changed, 14 insertions(+), 35 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 fa99cdf..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
@@ -2,30 +2,19 @@
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yuanchu.mom.common.PrintChina;
-import com.yuanchu.mom.dto.DepartmentDto;
-import com.yuanchu.mom.dto.UserDto;
-import com.yuanchu.mom.dto.UserPageDto;
-import com.yuanchu.mom.pojo.Department;
-import com.yuanchu.mom.mapper.DepartmentMapper;
-import com.yuanchu.mom.pojo.Device;
-import com.yuanchu.mom.pojo.User;
-import com.yuanchu.mom.service.DepartmentService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.yuanchu.mom.utils.QueryWrappers;
+import com.yuanchu.mom.dto.DepartmentDto;
+import com.yuanchu.mom.mapper.DepartmentMapper;
+import com.yuanchu.mom.pojo.Department;
+import com.yuanchu.mom.service.DepartmentService;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import lombok.var;
-import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-import java.sql.Wrapper;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
import java.util.stream.Collectors;
/**
@@ -45,6 +34,8 @@
DepartmentMapper departmentMapper;
+
+
//娣诲姞閮ㄩ棬
@Override
public int addDepartment(Department department) {
@@ -56,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))
@@ -83,23 +75,6 @@
return removeBatchByIds(department);
}
- //鏍规嵁閫夋嫨鐨勬爲灞曠ず鐩稿叧鐨勪汉鍛�
- @Override
- public Map<String, Object> showUserById(Page page, UserDto user) {
- //鏍规嵁閮ㄩ棬id,鏌ヨ浠栫殑鎵�鏈夊瓙绫籭d
- List<Integer> list = departmentMapper.selectSonById(Integer.parseInt(user.getDepartId()));
- List<String> ids = list.stream()
- .map(Object::toString)
- //.collect(Collectors.joining(","));
- .collect(Collectors.toList());
- log.info(ids+"\n");
- Map<String, Object> map = new HashMap<>();
- map.put("head", PrintChina.printChina(UserDto.class));
- map.put("body", departmentMapper.showUserById(page, ids, QueryWrappers.queryWrappers(user)));
- return map;
- }
-
-
//鍒ゆ柇鏄惁鏈夊瓙绫�,鐩村埌娌℃湁涓烘
public List<Department> getDepartment(Integer id) {
List<Department> list = new ArrayList<>();
@@ -115,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