user30

mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/contractManage/ContractManageApplicationService.java

@@ -982,7 +982,8 @@ public class ContractManageApplicationService {
                         && Objects.equals(item.getContractType(), contractType))
                 .collect(Collectors.toList());
         if (contractManagePOs != null && contractManagePOs.size() > 1) {
-            throw new ServiceException("存在多条相同费用科目的合同，请检查");
+            resultContract.setIsMany("1");
+            return resultContract;
         }
         if(contractManagePOList != null && contractManagePOList.size()>0){
             if(StringUtils.isNotEmpty(settlementCustomersCode)){

mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/contractManage/repository/po/ContractManagePO.java

@@ -183,5 +183,5 @@ public class ContractManagePO extends BaseVOEntity{
 
     @ApiModelProperty(name = "是否包含运输费用(1-包含，2-包含)")
     private Integer transportationCosts;
-
+    private String isMany;
 }