浏览代码

feature(角色授权情况报错修改): 角色授权情况报错修改

角色授权情况报错修改
mazq 4 年之前
父节点
当前提交
7eed9358a1
共有 1 个文件被更改,包括 5 次插入1 次删除
  1. 5 1
      src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/auth/RoleRptController.java

+ 5 - 1
src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/auth/RoleRptController.java

@@ -100,10 +100,14 @@ public class RoleRptController {
     @Permission(value = "role_auth")
     @Permission(value = "role_auth")
     @GetMapping(value = "/getRoleQuotasInfo/{appId}")
     @GetMapping(value = "/getRoleQuotasInfo/{appId}")
     public Result<AppRoleCalculateVo> getRoleTjInfo(@PathVariable("appId") String appId) {
     public Result<AppRoleCalculateVo> getRoleTjInfo(@PathVariable("appId") String appId) {
+        AppRoleCalculateVo vo = new AppRoleCalculateVo();
         ApplyInfo applyInfo = applyInfoFacade.applyDetail(appId);
         ApplyInfo applyInfo = applyInfoFacade.applyDetail(appId);
         String orgId = applyInfo.getOrgId();
         String orgId = applyInfo.getOrgId();
+        //主客体授权版本,应用所属机构id可为空
+        if(StringUtils.isBlank(orgId)) {
+            return Result.success(vo);
+        }
         Map<String, Object> resultMap = roleAuthInfoFacade.getRoleTjInfo(appId, orgId);
         Map<String, Object> resultMap = roleAuthInfoFacade.getRoleTjInfo(appId, orgId);
-        AppRoleCalculateVo vo = new AppRoleCalculateVo();
         Object roleNumsObj = resultMap.get("ROLENUMS");
         Object roleNumsObj = resultMap.get("ROLENUMS");
         Object initNumsObj = resultMap.get("INITNUMS");
         Object initNumsObj = resultMap.get("INITNUMS");
         Integer roleNums = roleNumsObj == null ? 0 : (Integer) roleNumsObj;
         Integer roleNums = roleNumsObj == null ? 0 : (Integer) roleNumsObj;