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 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 commonContractVoResultBean = commonContractFeign.getContractBySalesOrderSid(record.getSaleOrderSid()); if (commonContractVoResultBean.getData() != null) {