MrBird пре 6 година
родитељ
комит
8d1a6614c1
1 измењених фајлова са 5 додато и 3 уклоњено
  1. 5 3
      febs-auth/src/main/java/cc/mrbird/febs/auth/manager/UserManager.java

+ 5 - 3
febs-auth/src/main/java/cc/mrbird/febs/auth/manager/UserManager.java

@@ -40,9 +40,11 @@ public class UserManager {
      */
     public SystemUser findByName(String username) {
         SystemUser user = userMapper.findByName(username);
-        List<UserDataPermission> permissions = userMapper.findUserDataPermissions(user.getUserId());
-        String deptIds = permissions.stream().map(p -> String.valueOf(p.getDeptId())).collect(Collectors.joining(StringPool.COMMA));
-        user.setDeptIds(deptIds);
+        if (user != null) {
+            List<UserDataPermission> permissions = userMapper.findUserDataPermissions(user.getUserId());
+            String deptIds = permissions.stream().map(p -> String.valueOf(p.getDeptId())).collect(Collectors.joining(StringPool.COMMA));
+            user.setDeptIds(deptIds);
+        }
         return user;
     }