From 97630b2f6fe445f05d2e5e9e1e0dc8102035dd7c Mon Sep 17 00:00:00 2001
From: 孔祥富 <kongxf@daryun.com>
Date: 星期一, 08 三月 2021 19:20:10 +0800
Subject: [PATCH] 提交

---
 febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/UserServiceImpl.java |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/UserServiceImpl.java b/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/UserServiceImpl.java
index bb93e08..1bc690d 100644
--- a/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/UserServiceImpl.java
+++ b/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/UserServiceImpl.java
@@ -92,10 +92,14 @@
         save(user);
         // 保存用户角色
         String[] roles = StringUtils.splitByWholeSeparatorPreserveAllTokens(user.getRoleId(), StringConstant.COMMA);
-        setUserRoles(user, roles);
-        // 保存用户数据权限关联关系
+        if(roles!=null){
+            setUserRoles(user, roles);
+        }
         String[] deptIds = StringUtils.splitByWholeSeparatorPreserveAllTokens(user.getDeptIds(), StringConstant.COMMA);
-        setUserDataPermissions(user, deptIds);
+        if(deptIds!=null){
+            // 保存用户数据权限关联关系
+            setUserDataPermissions(user, deptIds);
+        }
     }
 
     @Override

--
Gitblit v1.8.0