Merge branch 'mazq-bugfix-0819' into 'release/v2.4.0'

fix(审计范围报错修改): 审计范围报错修改

See merge request dcuc-tjdsj/auth-service!119

dcuc-auth-service/src/main/java/com/dragoninfo/dcuc/auth/auth/bpo/RoleInfoBPO.java

@@ -294,7 +294,7 @@ public class RoleInfoBPO extends BaseBPO<RoleInfo, String> {
     public List<CountVO> getRoleCount(String appIds, boolean countLimitRole) {
         String sql = "SELECT new com.dragoninfo.dcuc.auth.auth.vo.CountVO(appId as id,count(appId) as item,sum(initNumber) as item2) from RoleInfo where ";
                 if(countLimitRole) {
-                   sql+= "isNotLimitCount = '1' and ";
+                   sql+= "isNotLimitCount = '0' and ";
                 }
                sql+= "appId in (" + appIds + ") group by appId";
         return PersistentFactory.getHibernateDao().find(sql);

dcuc-auth-service/src/main/java/com/dragoninfo/dcuc/auth/auth/business/impl/AuthApplyBusiness.java

@@ -672,7 +672,7 @@ public class AuthApplyBusiness implements IAuthApplyBusiness {
         String applyOrdNo = updateDTO.getApplyOrdNo();
         WorkFlow workFlow = workFlowService.getByApplyOrdNo(applyOrdNo);
         if(null == workFlow) {
-            return ResponseStatus.fail();
+            return ResponseStatus.fail("工单不存在");
         }
 
         String applicantIdcard = workFlow.getApplicantIdcard();
@@ -687,9 +687,6 @@ public class AuthApplyBusiness implements IAuthApplyBusiness {
             return ResponseStatus.fail("申请单内容为空");
         }
 
-        List<AppFunAuthResourceDTO> updateList = fillResourceInfo(resourceInfos, delResourceInfos, userInfo);
-
-
         workFlow.setApplicantPhoneNo(updateDTO.getApplicantPhoneNo());
         workFlow.setFlowContent(updateDTO.getFlowContent());
         workFlow.setApplyReason(updateDTO.getApplyReason());
@@ -703,15 +700,18 @@ public class AuthApplyBusiness implements IAuthApplyBusiness {
             workFlow.setEndTime(null);
         }
         String operateType = updateDTO.getOperateType();
+        workFlow.setOperateType(operateType);
         if(AuthFlowOpeCons.SAVE.equals(operateType)) {
             workFlow.setFlowStatus(WorkFlowStatusEnum.SAVING.getValue());
         } else {
             workFlow.setFlowStatus(WorkFlowStatusEnum.APPLYING.getValue());
         }
+
         AppFunAuthApplyDTO appFunAuthApplyDTO = new AppFunAuthApplyDTO();
         WorkFlowDTO workFlowDTO = new WorkFlowDTO();
         BeanUtils.copyProperties(workFlow, workFlowDTO);
         appFunAuthApplyDTO.setWorkFlow(workFlowDTO);
+        List<AppFunAuthResourceDTO> updateList = fillResourceInfo(resourceInfos, delResourceInfos, userInfo);
         appFunAuthApplyDTO.setResourceInfos(updateList);
         String url = authConfig.getApprovalCenterUrl();
         String api = ApprovalApiConstance.APPROVAL_UPDATE_API;