From 7a282d69e08d875a016975ea4b980bec98a9bab8 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 24 九月 2021 18:06:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/four_member' into four_member

---
 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/RoleServiceImpl.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/RoleServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/RoleServiceImpl.java
index 8bbe63b..4971867 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/RoleServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/RoleServiceImpl.java
@@ -30,6 +30,7 @@
 import com.panzhihua.service_user.service.RoleService;
 
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.util.StringUtils;
 
 /**
  * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -224,7 +225,7 @@
     public R putMenuRole(MenuRoleVO menuRoleVO) {
         List<Long> menuIds = new ArrayList<>();
         Long roleId = menuRoleVO.getRoleId();
-        if(menuRoleVO.getRoleName()!=null){
+        if(!StringUtils.isEmpty(menuRoleVO.getRoleName())){
             SysRoleDO sysRoleDO=new SysRoleDO();
             sysRoleDO.setRoleId(roleId);
             sysRoleDO.setRoleName(menuRoleVO.getRoleName());

--
Gitblit v1.7.1