From 9a1ea7a666a5c9acb189ddad066bd43312291251 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期三, 17 一月 2024 14:02:37 +0800
Subject: [PATCH] 2024-01-16 朱宝民 取水口与控制器的绑定与解绑
---
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserSv.java | 43 +++++++++++++++++++++++++++----------------
1 files changed, 27 insertions(+), 16 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 aaa5d31..77591e9 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,31 +182,42 @@
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());
}
+ /**
+ * 娣诲姞瑙掕壊缂栧彿鍒楄〃銆佽鑹插悕绉板垪琛ㄣ�佹潈闄愬垪琛�
+ * 濡傛灉褰撳墠鐢ㄦ埛鏄秴绾х鐞嗗憳锛屽垯涓婅堪涓夐」鍧囦负admin
+ */
List list_roleIds = new ArrayList();
List list_roleNames = new ArrayList();
+ if(voUserInfo.getUserName().equals("瓒呯骇绠＄悊鍛�")) {
+ array_permission.add("admin");
+ list_roleIds.add("admin");
+ list_roleNames.add("admin");
+ } else {
+ List<Map<String, Object>> list = Optional.ofNullable(urDao.getPermissionsByUserId(userId)).orElse(new ArrayList<>());
+ if(list.size() > 0) {
+ 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").toString());
+ list_roleNames.add(job.getString("roleName"));
- List<Map<String, Object>> list = Optional.ofNullable(urDao.getPermissionsByUserId(userId)).orElse(new ArrayList<>());
- if(list.size() > 0) {
- 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_roleNames.add(job.getString("roleName"));
-
- Long perId = Optional.ofNullable(job.getLong("perId")).orElse(0L);
- BaRolePermissions baRolePermissions = baRolePermissionsMapper.selectByPrimaryKey(perId);
- if(baRolePermissions != null) {
- array_permission.addAll(baRolePermissions.getPermissions());
+ Long perId = Optional.ofNullable(job.getLong("perId")).orElse(0L);
+ BaRolePermissions baRolePermissions = baRolePermissionsMapper.selectByPrimaryKey(perId);
+ if(baRolePermissions != null) {
+ array_permission.addAll(baRolePermissions.getPermissions());
+ }
}
}
- voUserInfo.setRoleIds(list_roleIds);
- voUserInfo.setRoleNames(list_roleNames);
- voUserInfo.setPermissions(array_permission);
}
+ voUserInfo.setRoleIds(list_roleIds);
+ voUserInfo.setRoleNames(list_roleNames);
+ voUserInfo.setPermissions(array_permission);
+
+
return voUserInfo;
}
}
--
Gitblit v1.8.0