【数据资产】

1、需求跨平台下架

@@ -243,17 +243,10 @@ public class DemandServiceImpl extends FlowAbstractImpl implements DemandService
         MfDemand entity = convertToEntity(rqVO);
         MfDemand entity = convertToEntity(rqVO);
         // 发起审批流程或保存草稿
         // 发起审批流程或保存草稿
         AddApprovalDTO approvalDTO = getAddApprovalDTO(entity, rqVO);
         AddApprovalDTO approvalDTO = getAddApprovalDTO(entity, rqVO);
-        super.startOrRestartWorkFlow(rqVO, rqVO.getBizApproveState(), approvalDTO, entity::setBizApproveState);
-        if (rqVO.getIsRestart()) {
-            // 重新提交
-            againSubmitFlow(entity, rqVO, approvalDTO);
-        } else {
+        super.restartWorkFlow(rqVO, rqVO.getBizApproveState(), approvalDTO, this::saveDemand, entity::setBizApproveState);
+        if (Boolean.FALSE.equals(rqVO.getIsRestart())) {
             // 修改业务数据
             // 修改业务数据
-            boolean flag = mfDemandService.updateById(entity);
-            if (!flag) {
-                throw new CsbrSystemException(SystemError.DATA_UPDATE_ERROR, rqVO.getImmediateApprove() ?
-                        messageSourceUtil.submitMessage(FUNCTION_NAME) : messageSourceUtil.updateMessage(FUNCTION_NAME));
-            }
+            mfDemandService.updateById(entity);
             afterUpdate(entity, rqVO);
             afterUpdate(entity, rqVO);
         }
         }
     }
     }