From ccb13428fc1e985eb7d50b2a8875a1527461a454 Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期三, 24 七月 2024 09:09:56 +0800
Subject: [PATCH] 执法记录

---
 project-admin/src/main/java/com/project/admin/controller/system/SysUserController.java |   13 +++++++++----
 1 files changed, 9 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 31b5c40..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)

--
Gitblit v1.9.1