pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voBa/VoUserInfo.java
@@ -21,7 +21,7 @@ private static final long serialVersionUID = 1L; @Schema(title = "用户ID") private Long userId; private String userId; @Schema(title = "用户姓名") private String userName; pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserRoleMapper.xml
@@ -65,7 +65,6 @@ SELECT rol.id AS roleId, rol.`name` AS roleName, <!-- per.permissions--> per.id AS perId FROM ba_user_role use_rol INNER JOIN ba_role rol ON rol.id = use_rol.roleId pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserSv.java
@@ -182,7 +182,7 @@ JSONArray array_permission = new JSONArray(); Map map = Optional.ofNullable(dao.getUserInfoById(userId)).orElse(new HashMap()); if(map.size() > 0) { voUserInfo.setUserId(userId); voUserInfo.setUserId(String.valueOf(userId)); voUserInfo.setUserName(map.get("userName").toString()); } @@ -194,7 +194,7 @@ JSONArray array= JSONArray.parseArray(JSON.toJSONString(list)); for (int i = 0; i < array.size(); i++) { JSONObject job = array.getJSONObject(i); list_roleIds.add(job.getLong("roleId")); list_roleIds.add(job.getLong("roleId").toString()); list_roleNames.add(job.getString("roleName")); Long perId = Optional.ofNullable(job.getLong("perId")).orElse(0L);
