wuzeyu
2024-07-04 04a3aa29899d113b8ed8dabf674b054e2b0e8c31
user模块 查全部接口返回userID变id
4个文件已修改
9 ■■■■■ 已修改文件
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaUserMapper.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voBa/VoUserInfo.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserMapper.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserSv.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaUserMapper.java
@@ -130,5 +130,4 @@
     */
    List<Map<String, Object>> getRoleNamesByUserId(@Param("userId") Long userId);
    BaUser selectById(Long id);
}
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voBa/VoUserInfo.java
@@ -21,7 +21,7 @@
    private static final long serialVersionUID = 202401241704002L;
    @Schema(title = "用户ID")
    private String userId;
    private String id;
    @Schema(title = "用户姓名")
    private String userName;
pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserMapper.xml
@@ -291,7 +291,7 @@
    <!--根据指定条件获取用户列表-->
    <select id="getUsers" resultType="com.dy.pipIrrGlobal.voBa.VoUserInfo">
        SELECT
            CAST(id AS char) AS userId,
            CAST(id AS char) AS id,
            phone,
            name AS userName,
            disabled AS stateId,
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserSv.java
@@ -76,7 +76,7 @@
        if(list_users.size() > 0) {
            for(int i = 0; i < list_users.size(); i++) {
                VoUserInfo voUserInfo = list_users.get(i);
                String userId = voUserInfo.getUserId();
                String userId = voUserInfo.getId();
                JSONArray array_roleIds = new JSONArray();
                List<Map<String, Object>> list_roleIds = Optional.ofNullable(this.dao.getRoleIdsByUserId(Long.parseLong(userId))).orElse(new ArrayList<>());
@@ -221,7 +221,7 @@
        if(map.size() == 0) {
            return null;
        }
        voUserInfo.setUserId(String.valueOf(userId));
        voUserInfo.setId(String.valueOf(userId));
        voUserInfo.setUserName(map.get("userName").toString());
        voUserInfo.setPhone(map.get("phone").toString());
        voUserInfo.setBlockId(map.get("blockId").toString());