【数据资产】

1、元数据导入

@@ -284,7 +284,13 @@ public class DemandServiceImpl extends FlowAbstractImpl implements DemandService
         String crossPlatformApproveState = "";
         String crossPlatformApproveState = "";
         for (String guid : guids) {
         for (String guid : guids) {
             MfDemand entity = mfDemandService.getById(guid);
             MfDemand entity = mfDemandService.getById(guid);
-            beforeRemove(entity);
+            if (entity == null) {
+                continue;
+            }
+            if (ApprovalStateEnum.CHECKING.getValue().equals(entity.getBizApproveState()) ||
+                    ApprovalStateEnum.PASSED.getValue().equals(entity.getBizApproveState())) {
+                throw new CsbrSystemException(SystemError.DATA_DEL_ERROR, "审批中和审批通过的数据不能删除!");
+            }
             mfDemandService.removeById(entity);
             mfDemandService.removeById(entity);
             afterRemove(entity);
             afterRemove(entity);
             crossPlatformApproveState = entity.getCrossPlatformApproveState();
             crossPlatformApproveState = entity.getCrossPlatformApproveState();

@@ -200,7 +200,13 @@ public class EnterpriseChangeApproveServiceImpl implements EnterpriseChangeAppro
         String crossPlatformApproveState = "";
         String crossPlatformApproveState = "";
         for (String guid : guids) {
         for (String guid : guids) {
             MfEnterpriseChangeApprove entity = mfEnterpriseChangeApproveService.getById(guid);
             MfEnterpriseChangeApprove entity = mfEnterpriseChangeApproveService.getById(guid);
-            beforeRemove(entity);
+            if (entity == null) {
+                continue;
+            }
+            if (ApprovalStateEnum.CHECKING.getValue().equals(entity.getBizApproveState()) ||
+                    ApprovalStateEnum.PASSED.getValue().equals(entity.getBizApproveState())) {
+                throw new CsbrSystemException(SystemError.DATA_DEL_ERROR, "审批中和审批通过的数据不能删除!");
+            }
             mfEnterpriseChangeApproveService.removeById(guid);
             mfEnterpriseChangeApproveService.removeById(guid);
             crossPlatformApproveState = entity.getCrossPlatformApproveState();
             crossPlatformApproveState = entity.getCrossPlatformApproveState();
         }
         }

@@ -382,7 +382,13 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris
         String crossPlatformApproveState = "";
         String crossPlatformApproveState = "";
         for (String guid : guids) {
         for (String guid : guids) {
             MfEnterprise entity = mfEnterpriseService.getById(guid);
             MfEnterprise entity = mfEnterpriseService.getById(guid);
-            beforeRemove(entity);
+            if (entity == null) {
+                continue;
+            }
+            if (ApprovalStateEnum.CHECKING.getValue().equals(entity.getBizApproveState()) ||
+                    ApprovalStateEnum.PASSED.getValue().equals(entity.getBizApproveState())) {
+                throw new CsbrSystemException(SystemError.DATA_DEL_ERROR, "审批中和审批通过的数据不能删除!");
+            }
             mfEnterpriseService.removeById(guid);
             mfEnterpriseService.removeById(guid);
             afterRemove(entity);
             afterRemove(entity);
             crossPlatformApproveState = entity.getCrossPlatformApproveState();
             crossPlatformApproveState = entity.getCrossPlatformApproveState();
@@ -806,7 +812,7 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris
      */
      */
     private void beforeRemove(MfEnterprise entity) {
     private void beforeRemove(MfEnterprise entity) {
         if (entity == null) {
         if (entity == null) {
-            throw new CsbrSystemException(SystemError.DATA_DEL_ERROR, messageSourceUtil.notExistsToDelMessage(FUNCTION_NAME));
+            return;
         }
         }
         if (ApprovalStateEnum.CHECKING.getValue().equals(entity.getBizApproveState()) ||
         if (ApprovalStateEnum.CHECKING.getValue().equals(entity.getBizApproveState()) ||
                 ApprovalStateEnum.PASSED.getValue().equals(entity.getBizApproveState())) {
                 ApprovalStateEnum.PASSED.getValue().equals(entity.getBizApproveState())) {