fix(调用app-service不提供orgId字段修改): 调用app-service不提供orgId字段修改

调用app-service不提供orgId字段修改

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

@@ -51,20 +51,13 @@ public class ApplicationController {
      * @param
      * @return
      */
-    @ApiOperation(value = "根据机构Id获取应用信息列表")
-    @ApiImplicitParam(name = "searchable", value = "查询条件,orgId不能为空")
+    @ApiOperation(value = "根据机构code获取应用信息列表")
+    @ApiImplicitParam(name = "searchable", value = "查询条件,orgCode不能为空")
     @PostMapping(value = "/appList/_search", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     public Result<List<ApplicationInfoVo>> getAppList(SearchDTO searchDTO) {
         List<ApplicationInfoVo> resultList = new ArrayList<>();
         Searchable searchable = Searchable.toSearchable(searchDTO);
         searchable.addSearchFilter("deleted", SearchOperator.eq, YesNotEnum.NO.getValue());
-//        AuthUserDTO userInfo = authUserInfoFacade.get(ContextUtils.getUserInfo().getId());
-        //外部人员只能配置自己所属厂商下的应用
-        //TODO
-        //目前权限主体没同步厂商字段
-//        if (UserTypeEnum.EXTERNAL.getValue().equals(userInfo.getUserType())) {
-//            searchable.addSearchFilter("manufacturerId", SearchOperator.eq, userInfo.getCompany());
-//        }
         Page<ApplyInfo> applyInfos = applyInfoFacade.applyInfoPage(searchable.toSearchDTO());
         if (applyInfos.getContent().size() < 1) {
             return Result.success(new ArrayList<>());
@@ -93,7 +86,6 @@ public class ApplicationController {
             applicationInfoVO.setInitquotas(0L);
             applicationInfoVO.setQuotaed(0L);
             applicationInfoVO.setLeavequotas(0L);
-            applicationInfoVO.setAppOrgId(applyInfo.getOrgId());
             apps.add(applicationInfoVO);
         }
         return apps;

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

@@ -55,43 +55,6 @@ public class OrgQuotaAuthController {
     @Autowired
     private ICodeListResourceFacade iCodeListResourceFacade;
 
-//    /**
-//     * 获取指定机构管辖的下级机构数量
-//     * @return
-//     */
-//    @ApiOperation(value = "获取指定机构管辖的下级机构数量")
-//    @ApiImplicitParam(name = "orgId", value = "机构id")
-//    @GetMapping(value = "/orgMgeNum")
-//    public Result<Map<String, Integer>> getOrgMgeNum(@RequestParam(value = "orgId") String orgId) {
-//        Map<String, Integer> orgMgeNum = authOrgInfoFacade.getOrgMgeNum(orgId);
-//        return Result.success(orgMgeNum);
-//    }
-//
-//        /**
-//     * 本级权限收回
-//     *
-//     * @return
-//     */
-//    @ApiOperation(value = "本级权限收回")
-//    @ApiImplicitParams({@ApiImplicitParam(name = "appId",required = true),
-//            @ApiImplicitParam(name = "roleId", value = "角色id",required = true),
-//            @ApiImplicitParam(name = "orgId", value = "机构id",required = true),
-//    })
-//    @Permission(value = "org_quota")
-//    @PutMapping(value = "/authCancelSelf",produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-//    public Result authCancelSelf(@RequestBody OrgQuotaOperateVo orgQuotaOperateVo) {
-//        String appId = orgQuotaOperateVo.getAppId();
-//        String roleId = orgQuotaOperateVo.getRoleId();
-//        String orgId = orgQuotaOperateVo.getAppOrgId();
-//        String appMtAuthOrgIds = iAppMtAuthFacade.appMtList(ContextUtils.getUserInfo().getId()).get(0).getOrgId();
-//        ResponseStatus responseMessage = iOrgQuotaAuthFacade.authCancelSelf(appId, roleId, orgId, appMtAuthOrgIds);
-//        if(ResponseStatus.SUCCESS_CODE.equals(responseMessage.getStatusCode())){
-//            return Result.success(responseMessage.getMessage());
-//        }else {
-//            return Result.fail(responseMessage.getMessage());
-//        }
-//    }
-
         /**
      * 机构配置-配额下发-计算
      * @param roleLevel 角色层级

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

@@ -69,12 +69,12 @@ public class RoleRptController {
         Page<TreeInfoVO> page = new PageImpl<TreeInfoVO>();
         if (StringUtils.isNotEmpty(appId)) {
             ApplyInfo applyInfo = applyInfoFacade.applyDetail(appId);
-            String appOrgId = applyInfo.getOrgId();
+            String appOrgCode = applyInfo.getOrgCode();
             //机构下的分配情况,经过权限中心导入的应用机构id不是不填项
-            if(StringUtils.isBlank(appOrgId)) {
+            if(StringUtils.isBlank(appOrgCode)) {
                 return Result.success(page.getTotalElements(),page.getContent());
             }
-            searchable.addSearchFilter("appOrgId", SearchOperator.eq, appOrgId);
+            searchable.addSearchFilter("appOrgCode", SearchOperator.eq, appOrgCode);
             page = roleAuthInfoFacade.getRptList(searchable.toSearchDTO());
             for (TreeInfoVO treeInfoVO : page.getContent()) {
                 String orgId = treeInfoVO.getId();
@@ -101,12 +101,12 @@ public class RoleRptController {
     public Result<AppRoleCalculateVo> getRoleTjInfo(@PathVariable("appId") String appId) {
         AppRoleCalculateVo vo = new AppRoleCalculateVo();
         ApplyInfo applyInfo = applyInfoFacade.applyDetail(appId);
-        String orgId = applyInfo.getOrgId();
+        String orgCode = applyInfo.getOrgCode();
         //主客体授权版本，应用所属机构id可为空
-        if(StringUtils.isBlank(orgId)) {
+        if(StringUtils.isBlank(orgCode)) {
             return Result.success(vo);
         }
-        Map<String, Object> resultMap = roleAuthInfoFacade.getRoleTjInfo(appId, orgId);
+        Map<String, Object> resultMap = roleAuthInfoFacade.getRoleTjInfo(appId, orgCode);
         Object roleNumsObj = resultMap.get("ROLENUMS");
         Object initNumsObj = resultMap.get("INITNUMS");
         Integer roleNums = roleNumsObj == null ? 0 : (Integer) roleNumsObj;
@@ -114,7 +114,7 @@ public class RoleRptController {
         vo.setRoleNums(roleNums);
         vo.setInitNums(initNums);
         vo.setAppId(appId);
-        vo.setOrgId(orgId);
+        vo.setOrgId(orgCode);
         return Result.success(vo);
     }