From b236dd0d61a9130a842425d7c7d63cb9910ba8be Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期二, 14 五月 2024 10:09:47 +0800
Subject: [PATCH] feat：部门调动
---
src/main/java/com/mindskip/xzs/controller/admin/UserController.java | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/mindskip/xzs/controller/admin/UserController.java b/src/main/java/com/mindskip/xzs/controller/admin/UserController.java
index 623b48d..db30138 100644
--- a/src/main/java/com/mindskip/xzs/controller/admin/UserController.java
+++ b/src/main/java/com/mindskip/xzs/controller/admin/UserController.java
@@ -1,20 +1,19 @@
package com.mindskip.xzs.controller.admin;
+import com.github.pagehelper.PageInfo;
import com.mindskip.xzs.base.BaseApiController;
import com.mindskip.xzs.base.RestResponse;
import com.mindskip.xzs.domain.*;
-import com.mindskip.xzs.domain.other.KeyValue;
import com.mindskip.xzs.domain.enums.UserStatusEnum;
+import com.mindskip.xzs.domain.other.KeyValue;
import com.mindskip.xzs.domain.vo.UserVO;
import com.mindskip.xzs.repository.UserDepartmentMapper;
import com.mindskip.xzs.service.*;
import com.mindskip.xzs.utility.DateTimeUtil;
+import com.mindskip.xzs.utility.PageInfoHelper;
import com.mindskip.xzs.utility.convert.UserClassConvert;
import com.mindskip.xzs.utility.excel.ExcelUtils;
import com.mindskip.xzs.viewmodel.admin.user.*;
-import com.mindskip.xzs.utility.PageInfoHelper;
-import com.github.pagehelper.PageInfo;
-
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -58,15 +57,15 @@
UserResponseVM.from(d));
page.setList(page.getList().stream().map(e->{
List<UserDepartment> userDepartments = userDepartmentMapper.selectByUserId(e.getId());
- String deptIds = "";
+ List<Department> list = new ArrayList<>();
for (UserDepartment userDepartment : userDepartments) {
Department byId = departmentService.getById(userDepartment.getDepartmentId());
- if(byId != null){
- deptIds = deptIds + byId.getName();
- break;
+ if (ObjectUtils.isNotEmpty(byId)) {
+ list.add(byId);
}
}
- e.setDeptNames(deptIds);
+ e.setDeptNames(StringUtils.join(list.stream().map(Department::getName).collect(Collectors.toList()), ","));
+ e.setDeptIdList(list.stream().map(Department::getId).collect(Collectors.toList()));
e.setTagNames(tagService.selectTagNamesByUserId(e.getId()));
return e;
}).collect(Collectors.toList()));
--
Gitblit v1.8.0