wks 3 роки тому
батько
коміт
b5fc2c7fa5

+ 2 - 2
src/main/java/com/ydtech/modules/protocol/entity/dto/PtlAgreementCostsFactorSaveDto.java

@@ -37,8 +37,8 @@ public class PtlAgreementCostsFactorSaveDto {
                 .filter(x -> (
                         !ObjectUtils.isEmpty(x.getValue().getParameter()) ||
                                 (!ObjectUtils.isEmpty(x.getValue().getMaxValue()) && !ObjectUtils.isEmpty(x.getValue().getMinValue()) &&
-                                        (!(x.getValue().getMaxValue() == 0) && !(x.getValue().getMinValue() == 0))
-                )))
+                                        (x.getValue().getMaxValue() != 0 && x.getValue().getMinValue() != 0))
+                ))
                 .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (a, b) -> a));
     }
 

+ 3 - 1
src/main/java/com/ydtech/modules/protocol/entity/dto/PtlAgreementProductCostsQueryDto.java

@@ -1,5 +1,6 @@
 package com.ydtech.modules.protocol.entity.dto;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.ydtech.modules.protocol.entity.po.PtlAgreementProductCosts;
 import io.swagger.annotations.ApiModelProperty;
@@ -25,6 +26,7 @@ public class PtlAgreementProductCostsQueryDto extends PtlAgreementProductCostsBa
 
     public PtlAgreementProductCostsQueryDto(PtlAgreementProductCosts ptlAgreementProductCostsSave) {
         super(ptlAgreementProductCostsSave);
-        this.factor = JSONArray.parseArray(ptlAgreementProductCostsSave.getCostsFactor());
+        this.factor = JSON.parseArray(ptlAgreementProductCostsSave.getCostsFactor());
     }
+
 }