From 18c11ea0ab8197fcdaec8d711ef447a255e8319a Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期五, 26 一月 2024 21:55:39 +0800
Subject: [PATCH] 2024-01-26 朱宝民 添加操作前水卡状态验证功能
---
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserSv.java | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
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 4708b90..1c2ebd3 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
@@ -87,10 +87,10 @@
if(list_users.size() > 0) {
for(int i = 0; i < list_users.size(); i++) {
VoUserInfo voUserInfo = list_users.get(i);
- Long userId = voUserInfo.getUserId();
+ String userId = voUserInfo.getUserId();
JSONArray array_roleIds = new JSONArray();
- List<Map<String, Object>> list_roleIds = Optional.ofNullable(this.dao.getRoleIdsByUserId(userId)).orElse(new ArrayList<>());
+ List<Map<String, Object>> list_roleIds = Optional.ofNullable(this.dao.getRoleIdsByUserId(Long.parseLong(userId))).orElse(new ArrayList<>());
for (int j = 0; j < list_roleIds.size(); j++) {
Map map_roleId = list_roleIds.get(j);
if(map_roleId != null) {
@@ -101,7 +101,7 @@
List<Map<String, Object>> list_roleId = (List<Map<String, Object>>) JSON.parse(array_roleIds.toJSONString());
JSONArray array_roleNames = new JSONArray();
- List<Map<String, Object>> list_roleNames = Optional.ofNullable(this.dao.getRoleNamesByUserId(userId)).orElse(new ArrayList<>());
+ List<Map<String, Object>> list_roleNames = Optional.ofNullable(this.dao.getRoleNamesByUserId(Long.parseLong(userId))).orElse(new ArrayList<>());
for (int j = 0; j < list_roleNames.size(); j++) {
Map map_roleName = list_roleNames.get(j);
if(map_roleName != null) {
@@ -226,10 +226,14 @@
VoUserInfo voUserInfo = new VoUserInfo();
JSONArray array_permission = new JSONArray();
Map map = Optional.ofNullable(dao.getUserInfoById(userId)).orElse(new HashMap());
- if(map.size() > 0) {
- voUserInfo.setUserId(userId);
- voUserInfo.setUserName(map.get("userName").toString());
+ if(map.size() == 0) {
+ return null;
}
+ voUserInfo.setUserId(String.valueOf(userId));
+ voUserInfo.setUserName(map.get("userName").toString());
+ voUserInfo.setPhone(map.get("phone").toString());
+ voUserInfo.setBlockId(map.get("blockId").toString());
+ voUserInfo.setBlockName(map.get("blockName").toString());
/**
* 娣诲姞瑙掕壊缂栧彿鍒楄〃銆佽鑹插悕绉板垪琛ㄣ�佹潈闄愬垪琛�
@@ -262,6 +266,7 @@
voUserInfo.setRoleNames(list_roleNames);
voUserInfo.setPermissions(array_permission);
+
return voUserInfo;
}
}
--
Gitblit v1.8.0