From 562926922386bb24070ea27eb5a27193c41e996b Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 18 四月 2024 14:46:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cnas-server/src/main/java/com/yuanchu/mom/service/impl/DepartmentServiceImpl.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 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 56e1c6d..1d9cd61 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
@@ -15,6 +15,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.mom.utils.QueryWrappers;
import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
import lombok.var;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -40,6 +41,7 @@
@Service
@AllArgsConstructor
@Transactional(rollbackFor = Exception.class)
+@Slf4j
public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Department> implements DepartmentService {
DepartmentMapper departmentMapper;
@@ -90,9 +92,11 @@
public Map<String, Object> showUserById(Page page, UserDto user) {
//鏍规嵁閮ㄩ棬id,鏌ヨ浠栫殑鎵�鏈夊瓙绫籭d
List<Integer> list = departmentMapper.selectSonById(Integer.parseInt(user.getDepartId()));
- String ids = list.stream()
+ List<String> ids = list.stream()
.map(Object::toString)
- .collect(Collectors.joining(","));
+ //.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)));
--
Gitblit v1.9.3