Prechádzať zdrojové kódy

Merge remote-tracking branch 'origin/master' into master

yangyj 1 rok pred
rodič
commit
6c42207ed9

+ 1 - 1
blade-service/blade-meter/src/main/java/org/springblade/meter/service/impl/MiddleMeterApplyServiceImpl.java

@@ -478,7 +478,7 @@ public class MiddleMeterApplyServiceImpl extends BaseServiceImpl<MiddleMeterAppl
                     throw new ServiceException("单价和计量数量和支付比例不能为空");
                 }
                 //校验比例是否在范围之内
-                if (l.getUpPayRatio() != null ){
+                if (l.getUpPayRatio() != null && l.getUpPayRatio().compareTo(BigDecimal.ZERO) != 0){
                     if (l.getPayRatio() == null) {
                         throw new ServiceException("修改失败,支付比例不能为空");
                     }