From 889e491f7b794a116a4164fcb99ebeba0094b02b Mon Sep 17 00:00:00 2001
From: "bo.yang" <bo.yang@bpsemi.com>
Date: Thu, 1 Jul 2021 10:10:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BF=AB=E9=80=92=E8=AE=A2=E9=98=85=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=EF=BC=9A=20=E4=BF=AE=E6=AD=A3=E5=B7=A5=E7=A8=8B?=
 =?UTF-8?q?=E5=90=AF=E5=8A=A8=E5=90=8E=E7=AC=AC=E4=B8=80=E6=AC=A1=E8=AE=A2?=
 =?UTF-8?q?=E9=98=85=EF=BC=8C=E8=BF=94=E5=9B=9Ecanceled=EF=BC=8C=E4=B8=8D?=
 =?UTF-8?q?=E6=89=A7=E8=A1=8Csuccess=E4=BB=BB=E5=8A=A1=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ruoyi/bps/controller/ExpSubscribeController.java | 2 +-
 box-bps/src/main/resources/templates/bps/subscribe/add.html   | 4 ++--
 .../src/main/resources/templates/bps/subscribe/subscribe.html | 2 ++
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/box-bps/src/main/java/com/ruoyi/bps/controller/ExpSubscribeController.java b/box-bps/src/main/java/com/ruoyi/bps/controller/ExpSubscribeController.java
index 5f6583990..ee8753a04 100644
--- a/box-bps/src/main/java/com/ruoyi/bps/controller/ExpSubscribeController.java
+++ b/box-bps/src/main/java/com/ruoyi/bps/controller/ExpSubscribeController.java
@@ -65,7 +65,7 @@ public class ExpSubscribeController extends BaseController
     public TableDataInfo list(ExpSubscribe expSubscribe)
     {
         startPage();
-        List<ExpSubscribe> list = new ArrayList<>();
+        List<ExpSubscribe> list;
         if(expSubscribe.getNumber().contains(",")){
             List<String> number= Arrays.asList(expSubscribe.getNumber().split(","));
             list=expSubscribeService.selectExpSubsPushRespByNumber(number);
diff --git a/box-bps/src/main/resources/templates/bps/subscribe/add.html b/box-bps/src/main/resources/templates/bps/subscribe/add.html
index 221d4e3fc..bf4238ba8 100644
--- a/box-bps/src/main/resources/templates/bps/subscribe/add.html
+++ b/box-bps/src/main/resources/templates/bps/subscribe/add.html
@@ -80,11 +80,12 @@
             $("#form-subscribe-add").serializeArray().map(function(val,key){formObject[val.name]=val.value;})
 
             $.ajax({
-                url:ctx+"/bps/subscribe/subscribe",
+                url:ctx+"bps/subscribe/subscribe",
                 type:"POST",
                 contentType: "application/json",
                 data: JSON.stringify(formObject),
                 dataType: "json",
+                async:false,  //如果不加async:false参数，ajax请求默认是异步的，会出现工程启动后第一次订阅，返回canceled，不执行success任务的问题
                 success:function(data){
                     alert(JSON.stringify(data));
                     parent.$("#number").val($("#number").val());
@@ -94,7 +95,6 @@
                     alert("错误！！");
                 }
             });
-
         };
     </script>
 </body>
diff --git a/box-bps/src/main/resources/templates/bps/subscribe/subscribe.html b/box-bps/src/main/resources/templates/bps/subscribe/subscribe.html
index 5e0160a0d..7cd1a621b 100644
--- a/box-bps/src/main/resources/templates/bps/subscribe/subscribe.html
+++ b/box-bps/src/main/resources/templates/bps/subscribe/subscribe.html
@@ -75,6 +75,7 @@
     <script th:inline="javascript">
         var editFlag = [[${@permission.hasPermi('bps:subscribe:edit')}]];
         var removeFlag = [[${@permission.hasPermi('bps:subscribe:remove')}]];
+        var stepToResp = [[${@permission.hasPermi('bps:expsubspushresp:list')}]];
         var companyDatas = [[${@dict.getType('express_company')}]];
         var prefix = ctx + "bps/subscribe";
 
@@ -134,6 +135,7 @@
                     align: 'center',
                     formatter: function(value, row, index) {
                         var actions = [];
+                        /*actions.push('<a class="btn btn-danger btn-xs ' + stepToResp + '" href="expsubspushresp/list/'+row.sid+'"><i class="fa fa-search"></i>信息跟踪</a>');*/
                         actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.sid + '\')"><i class="fa fa-edit"></i>编辑</a> ');
                         actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.sid + '\')"><i class="fa fa-remove"></i>删除</a>');
                         return actions.join('');