From 944f7079cea1d7e5b9278f608439109a8d843e28 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 13 二月 2025 14:32:23 +0800
Subject: [PATCH] 后台报修,房屋验收管理
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java | 130 -------------------------------------------
1 files changed, 0 insertions(+), 130 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
index 3475998..c5afa68 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
@@ -82,105 +82,6 @@
// }
/**
- * 人员借用列表
- */
-// @ApiOperation(value = "人员借用列表")
-// @GetMapping("/userBorrowList")
-// public AjaxResult userBorrowList(@RequestParam(required = false) String name,
-// @RequestParam(required = false) Integer type)
-// {
-//
-// UserAddListVO userAddListVO = new UserAddListVO();
-//
-// Long companyId = tokenService.getLoginUser().getUser().getCompanyId();
-//
-// List<TCompany> companyList = new ArrayList<>();
-// List<TDept> deptList = new ArrayList<>();
-// List<SysUser> userList = new ArrayList<>();
-// // 查询公司
-// if(Objects.nonNull(type) && type == 1){
-// companyList = companyService.userAddListByCompanyName(name);
-// }
-// // 查询部门
-// if(Objects.nonNull(type) && type == 2){
-// deptList = tDeptService.userAddListByDeptName(name);
-// }
-// // 查询用户
-// if(Objects.nonNull(type) && type == 3){
-// userList = userService.selectListByNamePhone(name);
-// }
-//
-// if(Objects.isNull(type)){
-// companyList = companyService.userAddListByCompanyName(name);
-// deptList = tDeptService.userAddListByDeptName(name);
-// userList = userService.selectListByNamePhone(name);
-// }
-//
-// List<Long> companyIds = companyList.stream().map(TCompany::getId).collect(Collectors.toList());
-// List<Long> deptCompanyIds = deptList.stream().map(TDept::getCompanyId).collect(Collectors.toList());
-// List<Long> userCompanyIds = userList.stream().map(SysUser::getCompanyId).collect(Collectors.toList());
-// companyIds.addAll(deptCompanyIds);
-// companyIds.addAll(userCompanyIds);
-//
-// companyIds = companyIds.stream().distinct().collect(Collectors.toList());
-//
-// if(CollectionUtils.isEmpty(companyIds)){
-// return AjaxResult.success(userAddListVO);
-// }
-// SysUser user1 = tokenService.getLoginUser().getUser();
-// if(!user1.isAdmin()){
-// companyIds = companyIds.stream().filter(e->!e.equals(companyId)).collect(Collectors.toList());
-// }
-//
-// // 查询符合要求的公司
-// List<UserLevelVO> parent = companyService.userAddListByCompanyIds(companyIds);
-//
-// List<TDept> depts = tDeptService.selectList();
-//
-// List<SysUser> sysUsers = userService.selectList();
-//
-// for (UserLevelVO userLevelVO : parent) {
-//
-// // 找到公司下的部门
-// List<TDept> tDepts = depts.stream().filter(e -> userLevelVO.getKey().equals(e.getCompanyId())).collect(Collectors.toList());
-// List<UserLevelVO> children = new ArrayList<>();
-// // 封装部门
-// for (TDept dept : tDepts) {
-// userLevelVO.setChildren(children);
-// UserLevelVO userLevelVO1 = new UserLevelVO();
-// userLevelVO1.setKey(dept.getId());
-// userLevelVO1.setTitle(dept.getDeptName());
-// // 找到部门下的人员
-// List<SysUser> users;
-// if(StringUtils.isNotEmpty(name) && type == 3){
-// users = sysUsers.stream().filter(e -> userLevelVO1.getKey().equals(e.getDeptId())
-// && ((StringUtils.isNotEmpty(e.getNickName()) && e.getNickName().contains(name)))
-// || (StringUtils.isNotEmpty(e.getPhonenumber()) && e.getPhonenumber().contains(name))).collect(Collectors.toList());
-// }else {
-// users = sysUsers.stream().filter(e -> userLevelVO1.getKey().equals(e.getDeptId())).collect(Collectors.toList());
-// }
-// List<UserLevelVO> children1 = new ArrayList<>();
-// // 封装人员
-// for (SysUser user : users) {
-// UserLevelVO userLevelVO2 = new UserLevelVO();
-// userLevelVO2.setKey(user.getUserId());
-// userLevelVO2.setTitle(user.getNickName());
-// userLevelVO2.setAvatar(user.getAvatar());
-// userLevelVO2.setFlag(true);
-// children1.add(userLevelVO2);
-// }
-// userLevelVO1.setChildren(children1);
-//
-// children.add(userLevelVO1);
-// }
-// userLevelVO.setChildren(children);
-// }
-// userAddListVO.setUserLevelVOS(parent);
-// userAddListVO.setUserList(sysUsers);
-// return AjaxResult.success(userAddListVO);
-// }
-
- /**
* 获取用户详情
*/
@ApiOperation(value = "获取用户详情")
@@ -244,37 +145,6 @@
userService.updateUserIfBlack(id);
return AjaxResult.success();
}
-
-
-// @Log(title = "用户管理", businessType = BusinessType.EXPORT)
-//// // @PreAuthorize("@ss.hasPermi('system:user:export')")
-// @PostMapping("/export")
-// public void export(HttpServletResponse response, SysUser user)
-// {
-// List<SysUser> list = userService.selectUserList(user);
-// ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
-// util.exportExcel(response, list, "用户数据");
-// }
-
-// @Log(title = "用户管理", businessType = BusinessType.IMPORT)
-//// // @PreAuthorize("@ss.hasPermi('system:user:import')")
-// @PostMapping("/importData")
-// public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception
-// {
-// ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
-// List<SysUser> userList = util.importExcel(file.getInputStream());
-// String operName = getUsername();
-// String message = userService.importUser(userList, updateSupport, operName);
-// return AjaxResult.success(message);
-// }
-
-// @PostMapping("/importTemplate")
-// public void importTemplate(HttpServletResponse response)
-// {
-// ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
-// util.importTemplateExcel(response, "用户数据");
-// }
-
/**
* 新增用户
--
Gitblit v1.7.1