【数据资产】

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

@@ -557,15 +557,13 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris
         if(CollectionUtils.isEmpty(approveList)){
         if(CollectionUtils.isEmpty(approveList)){
             return enterpriseRSVO;
             return enterpriseRSVO;
         }
         }
-        System.out.println("=========approveList," + JSON.toJSONString(approveList));
 
 
         // 判断最新变更数据是否是审批中 审批中显示最新数据 驳回或通过显示最新一次审批通过数据
         // 判断最新变更数据是否是审批中 审批中显示最新数据 驳回或通过显示最新一次审批通过数据
         if ("B".equals(enterpriseRSVO.getBizApproveState())) {
         if ("B".equals(enterpriseRSVO.getBizApproveState())) {
             Optional<MfEnterpriseChangeApprove> changeApproveOptFirst = approveList.stream().filter(item -> "2".equals(item.getDataType())).findFirst();
             Optional<MfEnterpriseChangeApprove> changeApproveOptFirst = approveList.stream().filter(item -> "2".equals(item.getDataType())).findFirst();
             if (changeApproveOptFirst.isPresent()) {
             if (changeApproveOptFirst.isPresent()) {
                 enterpriseRSVO = csbrBeanUtil.convert(changeApproveOptFirst.get(), EnterpriseRSVO.class);
                 enterpriseRSVO = csbrBeanUtil.convert(changeApproveOptFirst.get(), EnterpriseRSVO.class);
-                System.out.println("=========enterpriseRSVO," + JSON.toJSONString(enterpriseRSVO));
-
+                enterpriseRSVO.setBizApproveState(mfEnterprise.getBizApproveState());
             }
             }
         }
         }