doLogin修改

application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/upms/controller/LoginController.java

@@ -40,6 +40,7 @@ import org.redisson.api.RBucket;
 import org.redisson.api.RedissonClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.crypto.password.PasswordEncoder;
+import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -423,7 +424,9 @@ public class LoginController {
         for (Map<String, Object> menuPermData : menuPermDataList) {
             Long menuId = (Long) menuPermData.get("menuId");
             SysMenuPerm menuPerm = allMenuPermMap.get(menuId);
-            menuPerm.getPermUrlSet().add(menuPermData.get("url").toString());
+            if (!ObjectUtils.isEmpty(menuPerm)) {
+                menuPerm.getPermUrlSet().add(menuPermData.get("url").toString());
+            }
         }
         // 根据菜单的上下级关联关系，将菜单列表还原为菜单树。
         List<TreeNode<SysMenuPerm, String>> menuTreeList =