From a4269e38231c75a9407cf4aa5e73eefabb649823 Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Mon, 31 Jul 2023 17:20:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=94=80=E5=94=AE=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E6=90=9C=E7=B4=A2=E6=97=B6=E5=86=8D=E6=AC=A1=E5=8F=91?=
 =?UTF-8?q?=E8=B5=B7=E7=9A=84=E6=8C=89=E9=92=AE=E4=B8=8D=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml | 3 ++-
 .../buscenter/biz/bussalesorder/BusSalesOrderService.java     | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml
index 636eaebf2e..350e1aa57d 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml
@@ -62,7 +62,8 @@
         bo.contractNo as contractId,
         bo.staffName as saler,
         bo.procDefId,
-        bo.procInstId
+        bo.procInstId,
+        if(length(bo.nodeState)>0,true,false) as showRePublishBtn
         FROM bus_sales_order bo
         left join bus_sales_order_price bp on bp.salesOrderSid = bo.sid
         left join bus_sales_order_deposit bd on bd.salesOrderSid = bo.sid
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 e27bacf38b..1f9b1d9dc6 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
@@ -1921,14 +1921,14 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         IPage<AppBusSalesOrderVo> pagging = baseMapper.getSaleOrders(page, qw, pq.getParams().getName(), "");
         for (AppBusSalesOrderVo record : pagging.getRecords()) {
             /*************再次发起按钮显示****************/
-            if (StringUtils.isNotBlank(pq.getParams().getType())) {
+           /* if (StringUtils.isNotBlank(pq.getParams().getType())) {
                 String type = pq.getParams().getType();
                 if (type.equals("2")) {
                     record.setShowRePublishBtn(true);
                 } else {
                     record.setShowRePublishBtn(false);
                 }
-            }
+            }*/
             /**************************************/
             ResultBean<CommonContractVo> commonContractVoResultBean = commonContractFeign.getContractBySalesOrderSid(record.getSaleOrderSid());
             if (commonContractVoResultBean.getData() != null) {