【数据资产】

1、加工单加工明细新增、修改参数

@@ -560,7 +560,12 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris
 
         // 判断最新变更数据是否是审批中 审批中显示最新数据 驳回或通过显示最新一次审批通过数据
         MfEnterpriseChangeApprove mfEnterpriseChangeApprove = approveList.get(0);
-        if (ApprovalStateEnum.CHECKING.getValue().equals(mfEnterpriseChangeApprove.getBizApproveState())) {
+        if ("B".equals(mfEnterpriseChangeApprove.getBizApproveState())) {
+            Optional<MfEnterpriseChangeApprove> changeApproveOptFirst = approveList.stream().filter(item -> "2".equals(item.getDataType())).findFirst();
+            if (changeApproveOptFirst.isPresent()) {
+                enterpriseRSVO = csbrBeanUtil.convert(changeApproveOptFirst.get(), EnterpriseRSVO.class);
+            }
+        } else if (ApprovalStateEnum.CHECKING.getValue().equals(mfEnterpriseChangeApprove.getBizApproveState())) {
             enterpriseRSVO = csbrBeanUtil.convert(mfEnterpriseChangeApprove, EnterpriseRSVO.class);
         }