From b2391be8ae895d96d5f9a506e22c0aa0619c78ba Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Tue, 30 Apr 2024 00:57:20 +0800
Subject: [PATCH] md

---
 .../com/xdadan/erp/web/emis/EmisStaffController.java   |  2 +-
 .../main/resources/mapper/EmisDestinationMapper.xml    | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisStaffController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisStaffController.java
index 211793073..c84398b85 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisStaffController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisStaffController.java
@@ -54,7 +54,7 @@ public class EmisStaffController extends BaseController
      * 获取取件员列表
      */
 //    @PreAuthorize("@ss.hasPermi('system:user:list')")
-    @JacksonFilter(include= {"empCode","empName","ownerSiteCode"},value= SysUser.class,type= JacksonFilter.JscksonFilterType.RESPONSE)
+    @JacksonFilter(include= {"empCode","empName","ownerSiteCode","ownerSiteName"},value= SysUser.class,type= JacksonFilter.JscksonFilterType.RESPONSE)
     @RequestMapping("/getStaffList")
     public TableDataInfo getStaffList(@RequestParam("postCode")String postCode)
     {
diff --git a/emis-biz/src/main/resources/mapper/EmisDestinationMapper.xml b/emis-biz/src/main/resources/mapper/EmisDestinationMapper.xml
index d975dad49..bcfecddfe 100644
--- a/emis-biz/src/main/resources/mapper/EmisDestinationMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisDestinationMapper.xml
@@ -31,14 +31,16 @@
 
         <association property="lineName"    column="line_code" select="selectLineNameByCode"/>
         <association property="countryName"    column="country" select="selectCountryNameByCode"/>
-        <association property="provinceName"    column="province" select="selectRegionNameByCode"/>
-        <association property="cityName"    column="city" select="selectRegionNameByCode"/>
-        <association property="countyName"    column="county" select="selectRegionNameByCode"/>
-        <association property="townName"    column="town" select="selectRegionNameByCode"/>
+
         <association property="siteName"    column="site_code" select="selectSiteNameByCode"/>
         <association property="countryAreaName"    column="country_area_id" select="selectCountryAreaNameById"/>
     </resultMap>
 
+<!--    <association property="provinceName"    column="province" select="selectRegionNameByCode"/>-->
+<!--    <association property="cityName"    column="city" select="selectRegionNameByCode"/>-->
+<!--    <association property="countyName"    column="county" select="selectRegionNameByCode"/>-->
+<!--    <association property="townName"    column="town" select="selectRegionNameByCode"/>-->
+
     <sql id="selectEmisDestinationVo">
         select id, dest_code, dest_name, dest_name_en, status, line_code, country, site_code, province, city, county, town, is_hinterland, country_area_id, remark, tenant_id, del_flag, create_by, create_site, create_time, update_by, update_site, update_time from emis_destination
     </sql>