From 8819e79adb6a87de0cc3c8bee684e7b07fa7ea7d Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期一, 15 一月 2024 22:11:19 +0800
Subject: [PATCH] 2024-01-15 朱宝民 优化获取用户信息接口
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserRoleMapper.xml | 1 -
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voBa/VoUserInfo.java | 2 +-
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserSv.java | 4 ++--
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voBa/VoUserInfo.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voBa/VoUserInfo.java
index 1638417..437a9f8 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voBa/VoUserInfo.java
+++ b/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;
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserRoleMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserRoleMapper.xml
index 2eb9c8c..8840d70 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserRoleMapper.xml
+++ b/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
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserSv.java
index aaa5d31..8e5fbc6 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserSv.java
+++ b/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);
--
Gitblit v1.8.0