From 9ab21680926a8e9938fe6195513bc166ad87044f Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Thu, 23 Apr 2020 15:48:53 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev
---
kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/resolver/TokenArgumentResolver.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/resolver/TokenArgumentResolver.java b/kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/resolver/TokenArgumentResolver.java
index c37a0d4..d5b321a 100644
--- a/kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/resolver/TokenArgumentResolver.java
+++ b/kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/resolver/TokenArgumentResolver.java
@@ -6,6 +6,7 @@
import com.kidgrow.common.feign.UserService;
import com.kidgrow.common.model.SysRole;
import com.kidgrow.common.model.SysUser;
+import com.kidgrow.common.utils.StringUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.core.MethodParameter;
import org.springframework.web.bind.support.WebDataBinderFactory;
@@ -77,11 +78,13 @@
user.setUsername(username);
}
List<SysRole> sysRoleList = new ArrayList<>();
- Arrays.stream(roles.split(",")).forEach(role -> {
- SysRole sysRole = new SysRole();
- sysRole.setCode(role);
- sysRoleList.add(sysRole);
- });
+ if(StringUtils.isNotBlank(roles)){
+ Arrays.stream(roles.split(",")).forEach(role -> {
+ SysRole sysRole = new SysRole();
+ sysRole.setCode(role);
+ sysRoleList.add(sysRole);
+ });
+ }
user.setRoles(sysRoleList);
return user;
}
--
Gitblit v1.8.0