Bladeren bron

问题处理

yzc 1 jaar geleden
bovenliggende
commit
223d6f8da5

+ 1 - 1
hx-account/src/main/java/com/fjhx/account/flow/AccountRequestFundsFlow.java

@@ -141,7 +141,7 @@ public class AccountRequestFundsFlow extends FlowDelegate {
         if ("3".equals(accountRequestFunds.getType())) {
             BigDecimal subtract = accountRequestFunds.getTotal().subtract(accountRequestFunds.getAdvanceAmounts());
             accountPayment.setAmount(subtract);
-            if(subtract.compareTo(BigDecimal.ZERO)==0){//不生成打款数据
+            if (subtract.compareTo(BigDecimal.ZERO) <= 0) {//不生成打款数据
                 return;
             }
         } else {

+ 4 - 1
hx-purchase/src/main/java/com/fjhx/purchase/service/pay/impl/PayServiceImpl.java

@@ -1,6 +1,7 @@
 package com.fjhx.purchase.service.pay.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -204,7 +205,9 @@ public class PayServiceImpl extends ServiceImpl<PayMapper, Pay> implements PaySe
         DynamicDataSourceContextHolder.push(SourceConstant.BASE);
         FlowExample flowExample = flowExampleService.getOne(Wrappers.<FlowExample>query().lambda().eq(FlowExample::getBusinessId, id));
         // 赋值流程id
-        result.setFlowExampleId(flowExample.getId());
+        if(ObjectUtil.isNotEmpty(flowExample)) {
+            result.setFlowExampleId(flowExample.getId());
+        }
 
         return result;
     }