From 8a98f5894beb29d3c5039e8c2505fe33bce6ecf7 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 14 一月 2025 20:40:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/SysUserClient.java | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/SysUserClient.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/SysUserClient.java
index 7f566d9..13c2481 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/SysUserClient.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/SysUserClient.java
@@ -74,6 +74,14 @@
R<SysUser> queryUserByUserName(@RequestBody String userName);
/**
+ * 通过账号和账号权限查询用户
+ * @param userName
+ * @return
+ */
+ @PostMapping("/user/queryUserByUserNameAndRoleType")
+ R<SysUser> queryUserByUserNameAndRoleType(@RequestParam("userName") String userName, @RequestParam("roleType") Integer roleType);
+
+ /**
* 新增加用户信息
* @param user
*/
@@ -104,8 +112,15 @@
* @param roleType
* @return
*/
- @PostMapping("/user/delShopUser")
+ @PostMapping("/user/user/delShopUser")
R delShopUser(@RequestParam("objectId") Integer objectId, @RequestParam("roleType") Integer roleType);
-
-
+
+
+ /**
+ * 根据id删除管理员账户
+ * @param userId
+ * @return
+ */
+ @PostMapping("/user/delSysUserById")
+ R delSysUserById(@RequestParam("userId") Long userId);
}
--
Gitblit v1.7.1