From 19c139df4bf046b9a1e7d39f3a35b436aa6e372e Mon Sep 17 00:00:00 2001
From: fanzongzhe <285169773@qq.com>
Date: Mon, 22 May 2023 11:16:14 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E5=86=8D=E6=AC=A1?=
 =?UTF-8?q?=E5=8F=91=E8=B5=B7=E6=8C=89=E9=92=AE=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../biz/bussalesorder/BusSalesOrderMapper.xml          |  2 +-
 .../biz/bussalesorder/BusSalesOrderService.java        | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

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 b04f28630a..1accf3539d 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
@@ -58,7 +58,7 @@
                if(bo.nodeState = '已办结', true, false)  as showStopBtn,
                bo.nodeState is null                   as showUpdateBtn,
                bo.nodeState is null                   as showDeleteBtn,
-               bo.nodeState is not null                   as showRePublishBtn,
+           --    bo.nodeState is not null               as showRePublishBtn,
                0                                      as showFinancialBtn,
                bo.type,
                bo.contractNo                          as contractId,
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 11bbaea4b8..0fe4463304 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
@@ -1777,6 +1777,16 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         IPage<BusSalesOrder> page = PagerUtil.queryToPage(pq);
         IPage<AppBusSalesOrderVo> pagging = baseMapper.getSaleOrders(page, qw, pq.getParams().getName(), "");
         for (AppBusSalesOrderVo record : pagging.getRecords()) {
+            /*************再次发起按钮显示****************/
+            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) {
                 record.setContractId(commonContractVoResultBean.getData().getContractNo());