From 0e12e4ab45db6768a0f45d8952f78b0ae9190723 Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期一, 19 五月 2025 16:09:01 +0800
Subject: [PATCH] 手机号登录,去掉短信验证。脱敏

---
 project-admin/src/main/java/com/project/admin/controller/system/SysUserController.java |   24 ++++++++++++++++++++----
 1 files changed, 20 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..411b4ff 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
@@ -1,6 +1,7 @@
 package com.project.admin.controller.system;
 
 import com.project.common.annotation.Log;
+import com.project.common.annotation.RepeatSubmit;
 import com.project.common.constant.UserConstants;
 import com.project.common.core.controller.BaseController;
 import com.project.common.core.domain.AjaxResult;
@@ -10,6 +11,7 @@
 import com.project.common.core.page.TableDataInfo;
 import com.project.common.enums.BusinessType;
 import com.project.common.utils.SecurityUtils;
+import com.project.common.utils.SensitiveUtil;
 import com.project.common.utils.StringUtils;
 import com.project.common.utils.poi.ExcelUtil;
 import com.project.system.domain.bo.editBo.UserDeptBo;
@@ -53,7 +55,8 @@
     public TableDataInfo list(SysUser user)
     {
         startPage();
-        List<SysUser> list = userService.selectUserList(user);
+        List<SysUser> list = userService.selectUserListCommon(user);
+        list.forEach(SensitiveUtil::desensitize);
         return getDataTable(list);
     }
 
@@ -62,7 +65,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 +116,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 +159,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 +204,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)
@@ -223,6 +231,13 @@
     public AjaxResult batchUserDeptSave(@RequestBody UserDeptBo bo)
     {
         return AjaxResult.success(userDeptService.batchUserDeptSave(bo));
+    }
+
+    @ApiOperation("鐢ㄦ埛澶氭満鏋勨�斺�旀満鏋勬爲")
+    @GetMapping("/batchUserDeptTree")
+    public AjaxResult batchUserDeptTree(@RequestParam("deptId") Long deptId)
+    {
+        return AjaxResult.success(userDeptService.batchUserDeptTree(deptId));
     }
 
     @ApiOperation("浼佷笟鐢ㄦ埛閲嶇疆瀵嗙爜")
@@ -325,6 +340,7 @@
     @ApiOperation(value = "淇濆瓨瀵煎叆淇℃伅")
     @Log(title = "瀵煎叆鐢ㄦ埛淇℃伅淇濆瓨" , businessType = BusinessType.IMPORT)
     @PostMapping("/saveImport")
+    @RepeatSubmit
     public AjaxResult saveImport(@RequestBody SysUserResultVo resultVo)
     {
         return toAjax(userService.saveImport(resultVo) ? 1 : 0);

--
Gitblit v1.9.1