From e7b6173a930a15c84cb90bd15d2ab9cc4e7d9cac Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 29 十月 2024 16:59:33 +0800
Subject: [PATCH] 合并代码

---
 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java |   38 +++++++++++++++++++++-----------------
 1 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
index 5636e6a..d69b216 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
@@ -19,6 +19,7 @@
 import com.ruoyi.system.query.GetSysUserList;
 import com.ruoyi.system.query.ShopUserStart;
 import com.ruoyi.system.service.*;
+import io.seata.core.context.RootContext;
 import io.seata.spring.annotation.GlobalTransactional;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -239,7 +240,6 @@
         if (user.getPhonenumber() != null) {
             user.setUserName(user.getPhonenumber());
         }
-        user.setPassword(null);
         user.setUpdateBy(SecurityUtils.getUsername());
         user.setUpdateTime(new Date());
         userService.updateUser(user);
@@ -354,7 +354,7 @@
     }
 
     @PostMapping("/getSysUser")
-    public R<SysUser> getSysUser(@RequestBody Long userId) {
+    public R<SysUser> getSysUser(@RequestParam("userId") Long userId) {
         try {
             SysUser sysUser = userService.selectUserById(userId);
             return R.ok(sysUser);
@@ -371,11 +371,13 @@
             sysUser.setUpdateBy(SecurityUtils.getUsername());
             sysUser.setUpdateTime(new Date());
             userService.updateUser(sysUser);
-            userRoleService.deleteSysUserRoleByUserId(sysUser.getUserId());
-            SysUserRole sysUserRole = new SysUserRole();
-            sysUserRole.setRoleId(sysUser.getRoleId());
-            sysUserRole.setUserId(sysUser.getUserId());
-            userRoleService.insertSysUserRole(sysUserRole);
+            if(null != sysUser.getRoleId()){
+                userRoleService.deleteSysUserRoleByUserId(sysUser.getUserId());
+                SysUserRole sysUserRole = new SysUserRole();
+                sysUserRole.setRoleId(sysUser.getRoleId());
+                sysUserRole.setUserId(sysUser.getUserId());
+                userRoleService.insertSysUserRole(sysUserRole);
+            }
             return R.ok(true);
         } catch (Exception e) {
             e.printStackTrace();
@@ -523,7 +525,6 @@
     /**
      * 重置密码
      */
-    @RequiresPermissions("system:user:edit")
     @Log(title = "用户管理", businessType = BusinessType.UPDATE)
     @PutMapping("/resetPwd")
     @ApiOperation(value = "重置密码", tags = {"管理后台-系统用户管理"})
@@ -538,7 +539,6 @@
     /**
      * 状态修改
      */
-    @RequiresPermissions("system:user:edit")
     @Log(title = "用户管理", businessType = BusinessType.UPDATE)
     @PutMapping("/changeStatus")
     public AjaxResult changeStatus(@RequestBody SysUser user) {
@@ -551,7 +551,6 @@
     /**
      * 根据用户编号获取授权角色
      */
-    @RequiresPermissions("system:user:query")
     @GetMapping("/authRole/{userId}")
     public AjaxResult authRole(@PathVariable("userId") Long userId) {
         AjaxResult ajax = AjaxResult.success();
@@ -565,7 +564,6 @@
     /**
      * 用户授权角色
      */
-    @RequiresPermissions("system:user:edit")
     @Log(title = "用户管理", businessType = BusinessType.GRANT)
     @PutMapping("/authRole")
     public AjaxResult insertAuthRole(Long userId, Long[] roleIds) {
@@ -577,7 +575,6 @@
     /**
      * 获取部门树列表
      */
-    @RequiresPermissions("system:user:list")
     @GetMapping("/deptTree")
     public AjaxResult deptTree(SysDept dept) {
         return success(deptService.selectDeptTreeList(dept));
@@ -682,16 +679,16 @@
     @ResponseBody
     @PostMapping("/addSysUser")
     @Transactional(rollbackFor = Exception.class)
-    public R addSysUser(@RequestBody SysUser user){
+    public R<Long> addSysUser(@RequestBody SysUser user) {
         if(StringUtils.isEmpty(user.getUserName())){
             user.setUserName(user.getPhonenumber());
         }
         if(!org.springframework.util.StringUtils.hasLength(user.getNickName())){
             user.setNickName(user.getPhonenumber());
         }
-        if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user)) {
-            throw new RuntimeException("手机号已开通账号");
-        }
+//        if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user)) {
+//            throw new RuntimeException("手机号已开通账号");
+//        }
         if (StringUtils.isNotEmpty(user.getUserName()) && !userService.checkUserNameUnique(user)) {
             throw new RuntimeException("登录账号已存在");
         }
@@ -705,7 +702,7 @@
         sysUserRole.setRoleId(user.getRoleId());
         sysUserRole.setUserId(user.getUserId());
         userRoleService.insertSysUserRole(sysUserRole);
-        return R.ok();
+        return R.ok(user.getUserId());
     }
     
     
@@ -717,4 +714,11 @@
         userService.resetPwd(user);
         return R.ok();
     }
+    
+    
+    @ResponseBody
+    @PostMapping("/getSysUserById")
+    public SysUser getSysUserById(@RequestParam("userId") Long userId){
+        return userService.getById(userId);
+    }
 }

--
Gitblit v1.7.1