From 7148100d4ca7edda2648d12c0b9fa0cdb68128d4 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Fri, 14 Jun 2024 10:48:12 +0800
Subject: [PATCH] md

---
 .../xdadan/erp/web/emis/EmisWaybillAttachmentController.java  | 2 +-
 .../src/main/java/com/xdadan/erp/emis/utils/Kd100Helper.java  | 4 ++--
 emis-biz/src/main/resources/mapper/EmisSiteMapper.xml         | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillAttachmentController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillAttachmentController.java
index 1609e2867..579f12778 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillAttachmentController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillAttachmentController.java
@@ -68,7 +68,7 @@ public class EmisWaybillAttachmentController extends EmisBaseController
     /**
      * 查询运单附件列表
      */
-    @PreAuthorize("@ss.hasPermi('emis:emisWaybillAttachment:list')")
+//    @PreAuthorize("@ss.hasPermi('emis:emisWaybillAttachment:list')")
     @GetMapping("/list")
     public TableDataInfo list(EmisWaybillAttachment emisWaybillAttachment)
     {
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/utils/Kd100Helper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/utils/Kd100Helper.java
index ddeb8061a..2ab2592b1 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/utils/Kd100Helper.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/utils/Kd100Helper.java
@@ -142,8 +142,8 @@ public class Kd100Helper {
 //            emisTmsTransferTrace.setTransferExpress("shunfeng");
 //            emisTmsTransferTrace = queryTmsTransferTraceByKd100(emisTmsTransferTrace);
 
-            String str=queryTraceByMainNoAndCom("SF1532297522428","shunfeng");
-
+            String str=queryTraceByMainNoAndCom("T7080300003681","探路速运");
+            System.out.println(str);
             List<EmisTmsScanRecord> list=cvtTraceToScanRecord("12321",str);
             System.out.println(JSON.toJSONString(list));
         } catch (Exception e) {
diff --git a/emis-biz/src/main/resources/mapper/EmisSiteMapper.xml b/emis-biz/src/main/resources/mapper/EmisSiteMapper.xml
index 003658b39..f4085ad0f 100644
--- a/emis-biz/src/main/resources/mapper/EmisSiteMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisSiteMapper.xml
@@ -272,7 +272,7 @@
             <if test="parentSiteCode != null and parentSiteCode != ''">
                 <choose>
                     <!-- 子网点 -->
-                    <when test="params.blIncludeChildSite != null and params.blIncludeChildSite == 1">
+                    <when test="params.blIncludeChildSite != null and params.blIncludeChildSite == '1'">
                         AND site_code in (
                             SELECT t1.site_code FROM (
                             SELECT * FROM emis_site WHERE parent_site_code IS NOT NULL ) t1,( SELECT @pid :=