From 66df2da5f7c05787ff215a66cfc882bc238bbcc4 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 14 一月 2025 20:39:02 +0800
Subject: [PATCH] 修改bug

---
 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java |   28 ++++++++++++++++++++++++++++
 1 files changed, 28 insertions(+), 0 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 8fa9afa..8ffd2ff 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
@@ -164,6 +164,7 @@
                     AppUserShop appUserShop = new AppUserShop();
                     appUserShop.setAppUserId(appUser.getId());
                     appUserShop.setShopId(sysUser1.getObjectId());
+                    appUserShop.setRoleType(2);
                     appUserShopClient.saveAppUserShop(appUserShop);
                     appUser.setUserType(2);
                     appUserClient.editAppUserById(appUser);
@@ -571,6 +572,8 @@
     public R<SysUser> queryUserByUserName(@RequestBody String userName){
         SysUser user = userService.getOne(Wrappers.lambdaQuery(SysUser.class)
                 .eq(SysUser::getUserName, userName)
+                .eq(SysUser::getDelFlag, "0")
+                .eq(SysUser::getStatus, 0)
                 .last("LIMIT 1"));
         return R.ok(user);
     }
@@ -696,4 +699,29 @@
         Set<String> rolePerms = menuService.selectMenuPermsByRoleId(roleId);
         return R.ok(rolePerms);
     }
+    
+    
+    
+    /**
+     * 通过账号和账号权限查询用户
+     * @param userName
+     * @return
+     */
+    @PostMapping("/queryUserByUserNameAndRoleType")
+    public R<SysUser>  queryUserByUserNameAndRoleType(@RequestParam("userName") String userName, @RequestParam("roleType") Integer roleType){
+        SysUser user = userService.getOne(Wrappers.lambdaQuery(SysUser.class)
+                .eq(SysUser::getUserName, userName)
+                .eq(SysUser::getDelFlag, "0")
+                .eq(SysUser::getStatus, 0)
+                .eq(SysUser::getRoleType, roleType)
+                .last("LIMIT 1"));
+        return R.ok(user);
+    }
+    
+    
+    @PostMapping("/delSysUserById")
+    public R delSysUserById(@RequestParam("userId") Long userId){
+        userService.deleteUserById(userId);
+        return R.ok();
+    }
 }

--
Gitblit v1.7.1