From dc6cc6623960829b3938165fe23843f007623548 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Fri, 19 Apr 2024 18:13:54 +0800
Subject: [PATCH] md

---
 .../erp/web/emis/EmisCountryController.java       | 13 +++++++++++++
 .../xdadan/erp/web/emis/EmisRegionController.java | 15 ++++++++++++++-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCountryController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCountryController.java
index 36c32315e..87d536aca 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCountryController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCountryController.java
@@ -13,6 +13,9 @@ package com.xdadan.erp.web.emis;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.xdadan.erp.common.annotation.filter.jackson.JacksonFilter;
+import com.xdadan.erp.emis.domain.EmisSite;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -60,6 +63,16 @@ public class EmisCountryController extends BaseController
         return getDataTable(list);
     }
 
+    @PreAuthorize("@ss.hasPermi('emis:emisCountry:list')")
+    @JacksonFilter(include= {"id","code","name","nameEn","twoCode"},value= EmisCountry.class,type= JacksonFilter.JscksonFilterType.RESPONSE)
+    @GetMapping("/listSimple")
+    public TableDataInfo listSimple(EmisCountry emisCountry)
+    {
+        startPage();
+        List<EmisCountry> list = emisCountryService.selectEmisCountryList(emisCountry);
+        return getDataTable(list);
+    }
+
     /**
      * 导出国家列表
      */
diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisRegionController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisRegionController.java
index 62356f2a5..33a24c5a6 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisRegionController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisRegionController.java
@@ -13,6 +13,9 @@ package com.xdadan.erp.web.emis;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.xdadan.erp.common.annotation.filter.jackson.JacksonFilter;
+import com.xdadan.erp.emis.domain.EmisCountry;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -58,9 +61,19 @@ public class EmisRegionController extends BaseController
         startPage();
         List<EmisRegion> list = emisRegionService.selectEmisRegionList(emisRegion);
         return getDataTable(list);
-//        return AjaxResult.success(list);
     }
 
+    @PreAuthorize("@ss.hasPermi('emis:emisRegion:list')")
+    @JacksonFilter(include= {"id","regionCode","regionName","regionNameEn","parentCode"},value= EmisRegion.class,type= JacksonFilter.JscksonFilterType.RESPONSE)
+    @GetMapping("/listSimple")
+    public TableDataInfo listSimple(EmisRegion emisRegion)
+    {
+        startPage();
+        List<EmisRegion> list = emisRegionService.selectEmisRegionList(emisRegion);
+        return getDataTable(list);
+    }
+
+
     /**
      * 导出四级省市区镇表列表
      */