From 51ad03fcc8ffdb52469216558031a1bd31ed1fa6 Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期二, 23 七月 2024 09:57:47 +0800
Subject: [PATCH] 0723添加异常预警，消息推送，企业确认流程，企业自助建议反馈
---
project-admin/src/main/java/com/project/admin/controller/system/SysUserController.java | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/project-admin/src/main/java/com/project/admin/controller/system/SysUserController.java b/project-admin/src/main/java/com/project/admin/controller/system/SysUserController.java
index 4379306..a90d71f 100644
--- a/project-admin/src/main/java/com/project/admin/controller/system/SysUserController.java
+++ b/project-admin/src/main/java/com/project/admin/controller/system/SysUserController.java
@@ -53,7 +53,7 @@
public TableDataInfo list(SysUser user)
{
startPage();
- List<SysUser> list = userService.selectUserList(user);
+ List<SysUser> list = userService.selectUserListCommon(user);
return getDataTable(list);
}
@@ -62,7 +62,7 @@
@PostMapping("/export")
public void export(HttpServletResponse response, SysUser user)
{
- List<SysUser> list = userService.selectUserList(user);
+ List<SysUser> list = userService.selectUserListCommon(user);
ExcelUtil<SysUser> util = new ExcelUtil<>(SysUser.class);
util.exportExcel(response, list, "鐢ㄦ埛鏁版嵁");
}
@@ -113,13 +113,15 @@
@PostMapping
public AjaxResult add(@Validated @RequestBody SysUser user)
{
-
+ user.setPassword(user.getPhonenumber());
if (user.getDeptId()!=null){
user.setUserType("01");
SysDept sysDept = deptService.selectDeptById(user.getDeptId());
if (sysDept.getAncestors().contains("101") || sysDept.getDeptId().equals(101L)){
user.setUserType("00");
user.setRecommendPhone(deptService.getCheckDeptIdByLoginDeptId(user.getDeptId()).toString());
+ } else {
+ user.setUserType("01");
}
}
@@ -154,9 +156,12 @@
{
userService.checkUserAllowed(user);
userService.checkUserDataScope(user.getUserId());
+ user.setPassword(user.getPhonenumber());
if (user.getDeptId()!=null){
SysDept sysDept = deptService.selectDeptById(user.getDeptId());
if (sysDept.getAncestors().contains("101") || sysDept.getDeptId().equals(101L)){
+ user.setUserType("00");
+ } else {
user.setUserType("01");
}
}
@@ -196,7 +201,7 @@
/**
* 閲嶇疆瀵嗙爜
*/
- @PreAuthorize("@ss.hasPermi('system:user:resetPwd')")
+// @PreAuthorize("@ss.hasPermi('system:user:resetPwd')")
@Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.UPDATE)
@PutMapping("/resetPwd")
public AjaxResult resetPwd(@RequestBody SysUser user)
@@ -225,6 +230,13 @@
return AjaxResult.success(userDeptService.batchUserDeptSave(bo));
}
+ @ApiOperation("鐢ㄦ埛澶氭満鏋勨�斺�旀満鏋勬爲")
+ @GetMapping("/batchUserDeptTree")
+ public AjaxResult batchUserDeptTree(@RequestParam("deptId") Long deptId)
+ {
+ return AjaxResult.success(userDeptService.batchUserDeptTree(deptId));
+ }
+
@ApiOperation("浼佷笟鐢ㄦ埛閲嶇疆瀵嗙爜")
@Log(title = "浼佷笟鐢ㄦ埛閲嶇疆瀵嗙爜", businessType = BusinessType.UPDATE)
@PostMapping("/resetCompanyUserPwd")
--
Gitblit v1.9.1