From 2f1d2636adbd763d729c5836aa720fe8844ba9f3 Mon Sep 17 00:00:00 2001
From: wang1 <844966816@qq.com>
Date: 星期五, 14 七月 2023 18:01:23 +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 | 11 ++++++++++-
1 files changed, 10 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 7f0634c..807c7f6 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
@@ -21,9 +21,11 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.vci.ubcs.system.user.entity.User;
import com.vci.ubcs.system.user.excel.UserExcel;
+import org.apache.ibatis.annotations.MapKey;
import org.apache.ibatis.annotations.Param;
import java.util.List;
+import java.util.Map;
/**
* Mapper 鎺ュ彛
@@ -62,6 +64,13 @@
*/
List<UserExcel> exportUser(@Param("ew") Wrapper<User> queryWrapper);
- List<User> getByRoleUserList(@Param("tenantId") String tenantId, @Param("roleName") String roleName);
+ /**
+ * 鏍规嵁瑙掕壊id鏌ヨ褰撳墠鐢ㄦ埛浠ュ鐨勬墍鏈夌敤鎴�
+ * @param roleId
+ * @param userId
+ * @return 閿�奸槦褰㈠紡
+ */
+ @MapKey("ID")
+ List<Map<String,String>> getUserMap(@Param("roleId") String roleId, @Param("userId") String userId);
}
--
Gitblit v1.9.3