From 11ccd809b2391e6e61b22d530c523ec622e4b866 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 09 十二月 2024 18:19:52 +0800
Subject: [PATCH] 门店
---
manage/src/main/java/com/jilongda/manage/authority/controller/SecUserController.java | 87 -------------------------------------------
1 files changed, 1 insertions(+), 86 deletions(-)
diff --git a/manage/src/main/java/com/jilongda/manage/authority/controller/SecUserController.java b/manage/src/main/java/com/jilongda/manage/authority/controller/SecUserController.java
index fa82bfe..dd2db16 100644
--- a/manage/src/main/java/com/jilongda/manage/authority/controller/SecUserController.java
+++ b/manage/src/main/java/com/jilongda/manage/authority/controller/SecUserController.java
@@ -81,19 +81,17 @@
private final PasswordEncoder passwordEncoder;
private final UserUtil userUtil;
private final SecUserRoleService secUserRoleService;
- private final TDeptService deptService;
private final LoginInfoUtil loginInfoUtil;
private final RedisAutoTemplate redisAutoTemplate;
@Autowired
- public SecUserController(SecUserService secUserService, SecRoleService secRoleService, SecResourcesService secResourcesService, PasswordEncoder passwordEncoder, UserUtil userUtil, SecUserRoleService secUserRoleService, TDeptService deptService, LoginInfoUtil loginInfoUtil, RedisAutoTemplate redisAutoTemplate) {
+ public SecUserController(SecUserService secUserService, SecRoleService secRoleService, SecResourcesService secResourcesService, PasswordEncoder passwordEncoder, UserUtil userUtil, SecUserRoleService secUserRoleService, LoginInfoUtil loginInfoUtil, RedisAutoTemplate redisAutoTemplate) {
this.secUserService = secUserService;
this.secRoleService = secRoleService;
this.secResourcesService = secResourcesService;
this.passwordEncoder = passwordEncoder;
this.userUtil = userUtil;
this.secUserRoleService = secUserRoleService;
- this.deptService = deptService;
this.loginInfoUtil = loginInfoUtil;
this.redisAutoTemplate = redisAutoTemplate;
}
@@ -317,89 +315,6 @@
e.printStackTrace();
}
}
- }
-
- /**
- * 人员新增列表
- */
- @ApiOperation(value = "人员新增列表",notes = "type 1=部门,2=用户")
- @GetMapping("/userAddList")
- public ApiResult userAddList(@RequestParam(required = false) String name)
- {
- UserAddListVO userAddListVO = new UserAddListVO();
-
- // 获取当前用户所在部门
- SecUser loginUser = loginInfoUtil.getLoginUser();
- Long deptId = loginUser.getDeptId();
- List<TDept> deptList = new ArrayList<>();
- List<SecUser> userList = new ArrayList<>();
- List<UserLevelVO> userLevelVOS = new ArrayList<>();
- if(!loginUser.isAdmin()){
- userList = secUserService.selectListByNamePhoneDeptId(name,deptId);
- if(CollectionUtils.isEmpty(userList)){
- return ApiResult.success(userAddListVO);
- }
-
- TDept dept = deptService.getById(deptId);
- UserLevelVO userLevelVO = new UserLevelVO();
- List<UserLevelVO> children = new ArrayList<>();
- for (SecUser user : userList) {
- UserLevelVO userLevelVO1 = new UserLevelVO();
- userLevelVO1.setKey(user.getId());
- userLevelVO1.setTitle(user.getNickName());
- userLevelVO1.setAvatar(user.getAvatarUrl());
- userLevelVO1.setFlag(true);
- userLevelVO1.setValue(CodeGenerateUtils.generateVolumeSn());
- children.add(userLevelVO1);
- }
- userLevelVO.setChildren(children);
- userLevelVO.setKey(dept.getId());
- userLevelVO.setTitle(dept.getDeptName());
- userLevelVO.setValue(CodeGenerateUtils.generateVolumeSn());
- userLevelVOS.add(userLevelVO);
- }else {
- // 查询符合要求部门id
- deptList = deptService.userAddListByDeptNameDeptIds(name,null);
- List<Long> deptIds = deptList.stream().map(TDept::getId).collect(Collectors.toList());
- userList = secUserService.selectListByNamePhoneDeptIds(name,null);
- deptIds.addAll(userList.stream().map(SecUser::getDeptId).collect(Collectors.toList()));
- // 查询部门
- deptList = deptService.userAddListByDeptNameDeptIds(null,deptIds);
- if(CollectionUtils.isEmpty(deptList)){
- return ApiResult.success(userAddListVO);
- }
- // 查询用户
- userList = secUserService.selectListByNamePhoneDeptIds(null,deptIds);
-
- for (TDept dept : deptList) {
- List<SecUser> users;
- if(StringUtils.hasLength(name) && !dept.getDeptName().contains(name)){
- users = userList.stream().filter(e -> dept.getId().equals(e.getDeptId())
- && (((StringUtils.hasLength(e.getNickName()) && e.getNickName().contains(name)))
- || (StringUtils.hasLength(e.getPhone()) && e.getPhone().contains(name)))).collect(Collectors.toList());
- }else {
- users = userList.stream().filter(e -> dept.getId().equals(e.getDeptId())).collect(Collectors.toList());
- }
- UserLevelVO userLevelVO = new UserLevelVO();
- List<UserLevelVO> children = new ArrayList<>();
- for (SecUser user : users) {
- UserLevelVO userLevelVO1 = new UserLevelVO();
- userLevelVO1.setKey(user.getId());
- userLevelVO1.setTitle(user.getNickName());
- userLevelVO1.setAvatar(user.getAvatarUrl());
- userLevelVO1.setFlag(true);
- userLevelVO1.setValue(CodeGenerateUtils.generateVolumeSn());
- children.add(userLevelVO1);
- }
- userLevelVO.setChildren(children);
- userLevelVO.setKey(dept.getId());
- userLevelVO.setTitle(dept.getDeptName());
- userLevelVO.setValue(CodeGenerateUtils.generateVolumeSn());
- userLevelVOS.add(userLevelVO);
- }
- }
- userAddListVO.setUserLevelVOS(userLevelVOS);
- return ApiResult.success(userAddListVO);
}
@ApiOperation(value = "用户导入")
--
Gitblit v1.7.1