From 8bd65ed0eab661b4d76c26650be445686f889ca5 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期二, 14 一月 2025 12:09:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java | 20 ++++++++++++++++++++
1 files changed, 20 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..2f17c3a 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
@@ -571,6 +571,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 +698,22 @@
Set<String> rolePerms = menuService.selectMenuPermsByRoleId(roleId);
return R.ok(rolePerms);
}
+
+
+
+ /**
+ * 通过账号和账号权限查询用户
+ * @param userName
+ * @return
+ */
+ @PostMapping("/queryUserByUserNameAndRoleType")
+ public R<SysUser> queryUserByUserNameAndRoleType(@RequestParam("roleType") 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);
+ }
}
--
Gitblit v1.7.1