From f898d9c005cdaa86113f3de893b81b497f7700e0 Mon Sep 17 00:00:00 2001
From: yujintao <yujintaodotcn@foxmail.com>
Date: Sun, 1 Mar 2020 21:14:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E5=88=97=E8=A1=A8=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../enterprise/controller/EnterpriseInfoController.java        | 3 +++
 .../src/main/resources/mapper/enterprise/EnterpriseInfoDao.xml | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/enterprise/controller/EnterpriseInfoController.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/enterprise/controller/EnterpriseInfoController.java
index 512872531..043e46c4e 100644
--- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/enterprise/controller/EnterpriseInfoController.java
+++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/enterprise/controller/EnterpriseInfoController.java
@@ -17,6 +17,7 @@
 
 package com.elink.esua.epdc.modules.enterprise.controller;
 
+import com.elink.esua.epdc.commons.mybatis.annotation.DataFilter;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ExcelUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
@@ -53,6 +54,7 @@ public class EnterpriseInfoController {
     private EnterpriseInfoService enterpriseInfoService;
 
     @GetMapping("page")
+    @DataFilter(tableAlias = "t", prefix = "AND", isPendingCreator = false)
     public Result<PageData<EnterpriseInfoDTO>> page(@RequestParam Map<String, Object> params) {
         PageData<EnterpriseInfoDTO> page = enterpriseInfoService.getEnterpriseInfoPageFromPc(params);
         return new Result<PageData<EnterpriseInfoDTO>>().ok(page);
@@ -89,6 +91,7 @@ public class EnterpriseInfoController {
     }
 
     @GetMapping("export")
+    @DataFilter(tableAlias = "t", prefix = "AND", isPendingCreator = false)
     public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
         List<EnterpriseInfoDTO> list = enterpriseInfoService.listExport(params);
         ExcelUtils.exportExcelToTarget(response, null, list, EnterpriseInfoExcel.class);
diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/enterprise/EnterpriseInfoDao.xml b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/enterprise/EnterpriseInfoDao.xml
index 40a77ce8f..eec3eef9f 100644
--- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/enterprise/EnterpriseInfoDao.xml
+++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/enterprise/EnterpriseInfoDao.xml
@@ -41,7 +41,7 @@
         where t.USER_ID = #{userId}
     </select>
     <select id="selectEnterpriseInfoPageFromPc" resultType="com.elink.esua.epdc.dto.enterprise.EnterpriseInfoDTO">
-        select * from epdc_enterprise_info
+        select * from epdc_enterprise_info t
         where DEL_FLAG = '0'
         <if test="enterpriseName != null and enterpriseName != ''">
             AND ENTERPRISE_NAME = #{enterpriseName}