From 4a9cb99da50561faf6bca6e298859fa39965f8b0 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期四, 13 七月 2023 15:10:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/mapper/UserMapper.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/mapper/UserMapper.java b/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/mapper/UserMapper.java
index 0d21766..7f0634c 100644
--- a/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/mapper/UserMapper.java
+++ b/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/mapper/UserMapper.java
@@ -43,6 +43,8 @@
*/
List<User> selectUserPage(IPage<User> page, @Param("user") User user, @Param("deptIdList") List<Long> deptIdList, @Param("tenantId") String tenantId);
+ List<User> selectUserPage(@Param("user") User user, @Param("deptIdList") List<Long> deptIdList, @Param("tenantId") String tenantId);
+
/**
* 鑾峰彇鐢ㄦ埛
*
@@ -50,7 +52,7 @@
* @param account
* @return
*/
- User getUser(String tenantId, String account);
+ User getUser(String tenantId, String account,String name);
/**
* 鑾峰彇瀵煎嚭鐢ㄦ埛鏁版嵁
@@ -60,4 +62,6 @@
*/
List<UserExcel> exportUser(@Param("ew") Wrapper<User> queryWrapper);
+ List<User> getByRoleUserList(@Param("tenantId") String tenantId, @Param("roleName") String roleName);
+
}
--
Gitblit v1.9.3