From bd57081dc1bcd94e1e4043a9e0a7c6953d4bb9d4 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期一, 01 四月 2024 19:19:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1
---
server/service/src/main/java/com/doumee/core/model/LoginUserInfo.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/core/model/LoginUserInfo.java b/server/service/src/main/java/com/doumee/core/model/LoginUserInfo.java
index e487c3a..54bd7f9 100644
--- a/server/service/src/main/java/com/doumee/core/model/LoginUserInfo.java
+++ b/server/service/src/main/java/com/doumee/core/model/LoginUserInfo.java
@@ -62,9 +62,12 @@
}
loginUserInfo.setRoles(rs);
// 璁剧疆鏉冮檺淇℃伅
+
List<String> pms = new ArrayList<>();
- for (SystemPermission permission : permissions) {
- pms.add(permission.getCode());
+ if(permissions!=null){
+ for (SystemPermission permission : permissions) {
+ pms.add(permission.getCode());
+ }
}
loginUserInfo.setPermissions(pms);
loginUserInfo.setCompanyIdList(user.getCompanyIdList());
--
Gitblit v1.9.3