From 52fd0d3834951305f7dd3e6f9370d319f1c80352 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 27 五月 2024 09:36:36 +0800
Subject: [PATCH] 添加用户使用List接收deptIds
---
src/main/java/com/mindskip/xzs/controller/admin/UserController.java | 29 +++++++++++------------------
1 files changed, 11 insertions(+), 18 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..d921a84 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;
@@ -53,20 +52,21 @@
@RequestMapping(value = "/page/list", method = RequestMethod.POST)
public RestResponse<PageInfo<UserResponseVM>> pageList(@RequestBody UserPageRequestVM model) {
+ model.setDepartmentId(ObjectUtils.isNotEmpty(model.getDepartmentId()) ? model.getDepartmentId() : getAdminDeptIds());
PageInfo<User> pageInfo = userService.userPage(model);
PageInfo<UserResponseVM> page = PageInfoHelper.copyMap(pageInfo, d ->
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()));
@@ -141,10 +141,10 @@
userService.updateByIdFilter(user);
}
userDepartmentMapper.removeByUserId(user.getId());
- for (String s : model.getDeptIds().split(",")) {
+ for (Integer s : model.getDeptIds()) {
UserDepartment userDepartment = new UserDepartment();
userDepartment.setUserId(user.getId());
- userDepartment.setDepartmentId(Integer.parseInt(s));
+ userDepartment.setDepartmentId(s);
userDepartmentMapper.insert(userDepartment);
}
if (ObjectUtils.isNotEmpty(model.getTagIds())) {
@@ -156,7 +156,6 @@
}}
).collect(Collectors.toList()));
}
- user.setDeptIds(model.getDeptIds());
return RestResponse.ok(user);
}
@@ -228,12 +227,6 @@
}
return RestResponse.ok();
- }
-
- @RequestMapping(value = "/setStatus", method = RequestMethod.POST)
- public RestResponse<String> setStatus(@RequestBody UserVO user) {
- userService.setStatus(user);
- return RestResponse.ok("鎿嶄綔鎴愬姛");
}
}
--
Gitblit v1.8.0