From f98ee3f245e3b0fffd7a5f2a3f788ab34f6ec522 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Mon, 13 May 2024 16:06:24 +0800
Subject: [PATCH] md

---
 .../erp/web/emis/EmisTransProductController.java       |  2 +-
 .../java/com/xdadan/erp/emis/domain/EmisWaybill.java   | 10 +++-------
 .../main/resources/mapper/EmisCustomerUserMapper.xml   |  3 +--
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTransProductController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTransProductController.java
index ba9a699da..81e851c24 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTransProductController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTransProductController.java
@@ -64,7 +64,7 @@ public class EmisTransProductController extends BaseController
     }
 
 //    @PreAuthorize("@ss.hasPermi('emis:emisTransProduct:list')")
-    @JacksonFilter(include= {"id","prodCode","prodName","prodNameEn"},value= EmisTransProduct.class,type= JacksonFilter.JscksonFilterType.RESPONSE)
+    @JacksonFilter(include= {"id","prodCode","prodName","prodNameEn","agingDesc"},value= EmisTransProduct.class,type= JacksonFilter.JscksonFilterType.RESPONSE)
     @RequestMapping("/listSimple")
     public TableDataInfo listSimple(EmisTransProduct emisTransProduct)
     {
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java
index db4ede59d..039e372d2 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java
@@ -58,8 +58,7 @@ public class EmisWaybill extends BaseEntity
     private Long userId;
     /* 寄件客户编号2502021 */
     private String customerCode;
-    /* 寄件客户客户名称 */
-    private String customerName;
+
     /* 收件客户编号2502021 */
     private String receiveCustomerCode;
     /* 收件客户客户名称 */
@@ -344,14 +343,12 @@ public class EmisWaybill extends BaseEntity
     /* 时区偏差 */
     private String timezoneOffset;
 
-
     private List<EmisWaybillCargo> cargoList;
     private List<EmisWaybillFeeitem> feeitemList;
     private List<EmisWaybillAttachment> attachmentList;
 
     private String sendSiteName;
 
-
     /* 扩展信息 */
     private String receiveCountryName;
     private String receiveProvinceName;
@@ -364,8 +361,7 @@ public class EmisWaybill extends BaseEntity
 //    private String transLineName;
     private String productName;
 
-
-
-
+    /* 寄件客户客户名称 */
+    private String customerName;
 
 }
diff --git a/emis-biz/src/main/resources/mapper/EmisCustomerUserMapper.xml b/emis-biz/src/main/resources/mapper/EmisCustomerUserMapper.xml
index 5966b0c2f..902d35e2c 100644
--- a/emis-biz/src/main/resources/mapper/EmisCustomerUserMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisCustomerUserMapper.xml
@@ -162,8 +162,7 @@
                 <!-- 包含子网点 -->
                 AND owner_site in (
                     SELECT t1.site_code FROM (
-                    SELECT * FROM emis_site WHERE parent_site_code IS NOT NULL ) t1,( SELECT @pid :=
-                    #{ownerSite} ) pd
+                    SELECT * FROM emis_site WHERE parent_site_code IS NOT NULL ) t1,( SELECT @pid :=#{ownerSite} ) pd
                     WHERE FIND_IN_SET( parent_site_code, @pid ) > 0 AND @pid := concat(@pid,',',site_code)
                     UNION
                     SELECT #{ownerSite} FROM dual