From 918fef7baf11014afe2ae9639de012dd6a2d0a1f Mon Sep 17 00:00:00 2001
From: dimengzhe <251008545@qq.com>
Date: Fri, 21 Apr 2023 14:51:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../buscenter/biz/bussalesorder/BusSalesOrderService.java | 8 +++++++-
 .../yxt/anrui/flowable/biz/flowtask/FlowTaskService.java  | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
index 7678826382..98f162e9dc 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
@@ -3435,7 +3435,13 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             }
             //价格折让 = 销售合同价（整体成交价）-销售指导价（整体指导价）
             //销售合同价-销售指导价
-            BigDecimal all = new BigDecimal(priceInfo.getSingleFinalPrice()).subtract(new BigDecimal(priceInfo.getSingleGuildPrice()));
+            BigDecimal all = BigDecimal.ZERO;
+            if(StringUtils.isNotBlank(priceInfo.getSingleFinalPrice())){
+                all = new BigDecimal(priceInfo.getSingleFinalPrice());
+            }
+            if(StringUtils.isNotBlank(priceInfo.getSingleGuildPrice())){
+                all = all.subtract(new BigDecimal(priceInfo.getSingleGuildPrice()));
+            }
             String priceAll = "";
             if(all.compareTo(BigDecimal.ZERO) <0){
                 //如果价格折让小于0，乘以-1
diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java
index b3881c2a0c..d35a82652a 100644
--- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java
+++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java
@@ -1972,7 +1972,7 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
             or.endOr();
         }
         if(StringUtils.isNotBlank(startUserSidParams)){
-            or.taskVariableValueLike("INITIATOR", "%" + startUserSidParams + "%");
+            or.processVariableValueLike("INITIATOR", "%" + startUserSidParams + "%");
         }
                 or.taskAssigneeLike("%" + userSid + "%")
                 .orderByTaskCreateTime().desc();