From c29ce426a6ce314bc26a23cd92d226cc01825783 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 26 八月 2024 18:18:27 +0800
Subject: [PATCH] 代码初始化
---
server/system_service/src/main/java/com/doumee/core/model/LoginUserInfo.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/server/system_service/src/main/java/com/doumee/core/model/LoginUserInfo.java b/server/system_service/src/main/java/com/doumee/core/model/LoginUserInfo.java
index 6d84788..907be16 100644
--- a/server/system_service/src/main/java/com/doumee/core/model/LoginUserInfo.java
+++ b/server/system_service/src/main/java/com/doumee/core/model/LoginUserInfo.java
@@ -4,6 +4,7 @@
import com.doumee.dao.system.model.SystemPermission;
import com.doumee.dao.system.model.SystemRole;
import com.doumee.dao.system.model.SystemUser;
+import com.github.xiaoymin.knife4j.core.util.CollectionUtils;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.beans.BeanUtils;
@@ -59,15 +60,19 @@
loginUserInfo.setCompany(company);
// 璁剧疆瑙掕壊淇℃伅
List<String> rs = new ArrayList<>();
- for (SystemRole role : roles) {
- rs.add(role.getCode());
+ if(CollectionUtils.isNotEmpty(roles)){
+ for (SystemRole role : roles) {
+ rs.add(role.getCode());
+ }
}
loginUserInfo.setSessionId(sessionId);
loginUserInfo.setRoles(rs);
// 璁剧疆鏉冮檺淇℃伅
List<String> pms = new ArrayList<>();
- for (SystemPermission permission : permissions) {
- pms.add(permission.getCode());
+ if(CollectionUtils.isNotEmpty(permissions)){
+ for (SystemPermission permission : permissions) {
+ pms.add(permission.getCode());
+ }
}
loginUserInfo.setPermissions(pms);
return loginUserInfo;
--
Gitblit v1.9.3