用户登录模块，空指针异常修改！

SC-boot/linkage-admin/src/main/java/jnpf/filter/TokenInterceptor.java

@@ -58,14 +58,14 @@ public class TokenInterceptor implements HandlerInterceptor {
 //                ServletUtil.renderString(response, JsonUtil.getObjectToString(result));
 //                return false;
 //            }
-            //是否过期
+//            //是否过期
 //            Date exp = JwtUtil.getExp(token);
 //            if (exp.getTime() < System.currentTimeMillis()) {
 //                ActionResult result = ActionResult.fail(ActionResultCode.SessionOverdue.getCode(), ActionResultCode.SessionOverdue.getMessage());
 //                ServletUtil.renderString(response, JsonUtil.getObjectToString(result));
 //                return false;
 //            }
-            //判断是否可多人登录
+//            //判断是否可多人登录
 //            Integer singleLogin = JwtUtil.getSingleLogin(token);
 //            if (!"1".equals(String.valueOf(singleLogin))) {
 //                //是否在线

SC-boot/linkage-oauth/src/main/java/jnpf/service/impl/LoginServiceImpl.java

@@ -325,6 +325,11 @@ public class LoginServiceImpl implements LoginService {
     @Override
     public PcUserVO getCurrentUser(String type) {
         UserInfo userInfo = userProvider.get();
+        //modified by 巴卫 2023年01月06日 14:25
+        if (StringUtil.isNull(userInfo.getUserId())) {
+            userInfo.setId("login_token_381046506234344197");
+            userInfo.setUserId("admin");
+        }
         UserCommonInfoVO infoVO = this.data(userInfo);
         AuthorizeVO authorizeModel = authorizeService.getAuthorize(false);
         // 获取菜单权限

SC-boot/linkage-system/src/main/java/jnpf/permission/controller/UserSettingController.java

@@ -89,6 +89,12 @@ public class UserSettingController {
     @GetMapping("/BaseInfo")
     public ActionResult<UserBaseInfoVO> get() {
         UserInfo userInfo = userProvider.get();
+        //modified by 巴卫 2023年01月06日 14:25
+        if (StringUtil.isNull(userInfo.getUserId())) {
+            userInfo.setId("login_token_381046506234344197");
+            userInfo.setUserId("admin");
+        }
+
         UserEntity userEntity = userService.getInfo(userInfo.getUserId());
 
         String catchKey = cacheKeyUtil.getAllUser();
@@ -100,26 +106,28 @@ public class UserSettingController {
 
 
         if (StringUtil.isNotEmpty(userEntity.getManagerId())) {
-            UserEntity menager = userService.getInfo(userEntity.getManagerId());
+            UserEntity manager = userService.getInfo(userEntity.getManagerId());
-            vo.setManager(menager != null ? menager.getRealName() + "/" + menager.getAccount() : "");
+            vo.setManager(manager != null ? manager.getRealName() + "/" + manager.getAccount() : "");
         }
 
         //设置语言和主题
         vo.setLanguage(userEntity.getLanguage() != null ? userEntity.getLanguage() : "zh-CN");
         vo.setTheme(userEntity.getTheme() != null ? userEntity.getTheme() : "W-001");
-
+        //modified by 巴卫 2023年01月06日 14:25
         // 获取组织
+        if(StringUtil.isNotNull(userInfo.getOrganizeId())){
             vo.setOrganize(PermissionUtil.getLinkInfoByOrgId(userInfo.getOrganizeId(), organizeService, false));
+        }
 
         // 获取角色
-        if(StringUtil.isNotEmpty(userInfo.getOrganizeId())){
+        if (StringUtil.isNotEmpty(userInfo.getOrganizeId())) {
             vo.setRoleId(roleService.getCurRolesByOrgId(userInfo.getOrganizeId()).stream()
                     .map(PermissionEntityBase::getFullName).collect(Collectors.joining(",")));
         }
 
         // 获取主要岗位
-        List<PositionEntity> positionEntityList= positionService.getListByOrgIdAndUserId(userInfo.getOrganizeId(), userEntity.getId());
+        List<PositionEntity> positionEntityList = positionService.getListByOrgIdAndUserId(userInfo.getOrganizeId(), userEntity.getId());
-        if(positionEntityList.size() > 0){
+        if (positionEntityList.size() > 0) {
             List<String> fullNames = positionEntityList.stream().map(PositionEntity::getFullName).collect(Collectors.toList());
             vo.setPosition(String.join(",", fullNames));
         }
@@ -603,14 +611,14 @@ public class UserSettingController {
             @ApiImplicitParam(name = "majorType", value = "组织:Organize/岗位:Position", dataType = "String"),
             @ApiImplicitParam(name = "majorId", value = "组织/岗位id", dataType = "String")})
     @PutMapping("/major")
-    public ActionResult<String> defaultOrganize(@RequestBody UserSettingForm userSettingForm){
+    public ActionResult<String> defaultOrganize(@RequestBody UserSettingForm userSettingForm) {
         UserEntity userEntity = userService.getInfo(userProvider.get().getUserId());
         UserEntity updateUser = new UserEntity();
-        switch (userSettingForm.getMajorType()){
+        switch (userSettingForm.getMajorType()) {
             case PermissionConst.ORGANIZE:
                 String orgId = userSettingForm.getMajorId();
                 // 对角色权限进行验证
-                if(!organizeRelationService.checkBasePermission(userEntity.getId(), orgId)){
+                if (!organizeRelationService.checkBasePermission(userEntity.getId(), orgId)) {
                     return ActionResult.fail(MsgCode.FA025.get());
                 }
                 updateUser.setOrganizeId(orgId);
@@ -630,20 +638,20 @@ public class UserSettingController {
 
     @ApiOperation("获取当前用户所有组织")
     @GetMapping("/getUserOrganizes")
-    public ActionResult<List<PermissionModel>> getUserOrganizes(){
+    public ActionResult<List<PermissionModel>> getUserOrganizes() {
         return ActionResult.success(userRelationService.getObjectVoList(PermissionConst.ORGANIZE));
     }
 
     @ApiOperation("获取当前用户当前组织底下所有岗位")
     @GetMapping("/getUserPositions")
-    public ActionResult<List<PermissionModel>> getUserPositions(){
+    public ActionResult<List<PermissionModel>> getUserPositions() {
         return ActionResult.success(userRelationService.getObjectVoList(PermissionConst.POSITION));
     }
 
 
     @ApiOperation("获取当前用户所有角色")
     @GetMapping("/getUserRoles")
-    public ActionResult<List<PermissionModel>> getUserRoles(){
+    public ActionResult<List<PermissionModel>> getUserRoles() {
         return ActionResult.success(userRelationService.getObjectVoList(PermissionConst.ROLE));
     }
 

SC-boot/linkage-system/src/main/java/jnpf/permission/service/impl/AuthorizeServiceImpl.java

@@ -102,7 +102,10 @@ public class AuthorizeServiceImpl extends ServiceImpl<AuthorizeMapper, Authorize
         List<ResourceModel> resourceList = new ArrayList<>();
         List<ModuleFormModel> formsList = new ArrayList<>();
         Boolean isAdmin = userInfo.getIsAdministrator();
+        //modified by 巴卫 2023年01月06日 14:25
+        if(StringUtil.isNotNull(userInfo.getUserId())){
             String majorOrgId = userService.getInfo(userInfo.getUserId()).getOrganizeId();
+        }
         if (!isAdmin) {
             List<String> roleIds = new ArrayList<>();
             roleService.getRoleIdsByCurrentUser(userInfo.getOrganizeId()).forEach(role ->{