From 7918c0611f1cdf1cad82250225307e5185abac4c Mon Sep 17 00:00:00 2001 From: ludc Date: 星期五, 27 十月 2023 10:37:49 +0800 Subject: [PATCH] bug修改:148(历史数据导入报错,当前分类没有设置编码规则,未找父级的编码规则的bug);150(主数据新增时未先找当前层级的编码规则,再向上查找的bug) --- Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/mapper/UserMapper.java | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 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 847bac9..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,4 +64,13 @@ */ List<UserExcel> exportUser(@Param("ew") Wrapper<User> queryWrapper); + /** + * 鏍规嵁瑙掕壊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