feature: 修改零信任登录用户校验

src/main/java/com/dragoninfo/dcuc/authweb/interceptor/SecurityAccessTokenResolver.java

@@ -75,6 +75,10 @@ public class SecurityAccessTokenResolver implements ISecurityAccessTokenResolver
         String appToken = HeadTokenUtils.getAppToken(request);
 
         log.info("用户令牌id:{} , 应用令牌id:{}", userToken, appToken);
+        if (StrUtil.isBlank(userToken)) {
+            log.error("用户令牌为空");
+            return null;
+        }
 
         if (cacheResolver != null) {
             //从缓存中取
@@ -87,11 +91,6 @@ public class SecurityAccessTokenResolver implements ISecurityAccessTokenResolver
             }
         }
 
-        if (StrUtil.isBlank(userToken)) {
-            log.error("用户令牌为空");
-            return null;
-        }
-
         BimUserInfoItemRespVO userInfoItemRespVO = bimBusinessFacade.getUserInfoByUserToken(userToken);
         String sfzh = userInfoItemRespVO.getSfzh();
         log.info("认证结果返回人员身份证号:{}, ", sfzh);
@@ -116,6 +115,7 @@ public class SecurityAccessTokenResolver implements ISecurityAccessTokenResolver
         securityUser.setEmail(userInfo.getEmail());
         securityUser.setQq(userInfo.getQqAccount());
         securityUser.setWechat(userInfo.getWxAccount());
+        securityUser.setUserType(userInfo.getUserType());
         securityUser.setSecurityOrgs(new String[]{userInfo.getOrgCode()});
         // 设置令牌扩展信息
         Map<String, Object> map = new HashMap<>(UserExtInfoEnum.values().length);

src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/auth/RoleInfoController.java

@@ -121,6 +121,9 @@ public class RoleInfoController {
     @GetMapping(value = "/role/{id}", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     public Result<RoleInfoVo> roleInfo(@PathVariable("id") String id) {
         RoleInfo roleInfo = roleInfoFacade.get(id);
+        if (null == roleInfo) {
+            return Result.failMessage("角色不存在");
+        }
         RoleInfoVo vo = new RoleInfoVo();
         BeanUtils.copyProperties(roleInfo, vo);
         return Result.success(vo);

src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/login/DcucLoginController.java

@@ -68,6 +68,7 @@ public class DcucLoginController {
             securityUser.setManId(userInfo.getId());
             securityUser.setDeptId(userInfo.getOrgId());
             securityUser.setSecurityOrg(userInfo.getOrgCode());
+            securityUser.setUserType(userInfo.getUserType());
             securityUser.setMobile(StringUtils.isBlank(userInfo.getMobileWork()) ? userInfo.getMobilePrivate() : userInfo.getMobileWork());
             List<SecurityRight> authmenu = getAuthmenu(securityUser);
             securityUser.setSecurityRightList(authmenu);