From 494ac185526d9febdeb98cd08fd9772afbba5ec8 Mon Sep 17 00:00:00 2001
From: yinzuomei <yinzuomei@elink-cn.com>
Date: Fri, 3 Jan 2020 17:22:30 +0800
Subject: [PATCH] =?UTF-8?q?bug#5014=E8=AF=9D=E9=A2=98=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=B7=BB=E5=8A=A0=E6=95=B0=E6=8D=AE=E6=9D=83?=
 =?UTF-8?q?=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/topic/controller/TopicController.java          | 7 ++++---
 .../modules/topic/service/impl/TopicServiceImpl.java       | 6 +-----
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/topic/controller/TopicController.java b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/topic/controller/TopicController.java
index 38fb4b3dd..407ebd6fc 100644
--- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/topic/controller/TopicController.java
+++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/topic/controller/TopicController.java
@@ -25,8 +25,8 @@ import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.commons.tools.validator.AssertUtils;
 import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
 import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
-import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
 import com.elink.esua.epdc.dto.topic.TopicDTO;
 import com.elink.esua.epdc.dto.topic.TopicDetailDTO;
 import com.elink.esua.epdc.dto.topic.form.TopicCloseFormDTO;
@@ -50,7 +50,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("topic")
 public class TopicController {
-    
+
     @Autowired
     private TopicService topicService;
 
@@ -92,6 +92,7 @@ public class TopicController {
     }
 
     @GetMapping("export")
+	@DataFilter(tableAlias = "temp", deptId = "grid_id", prefix = "AND", isPendingCreator = false)
     public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
         List<TopicDTO> list = topicService.list(params);
         ExcelUtils.exportExcelToTarget(response, null, list, TopicExcel.class);
@@ -161,4 +162,4 @@ public class TopicController {
         return new Result<TopicDetailDTO>().ok(data);
     }
 
-}
\ No newline at end of file
+}
diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/topic/service/impl/TopicServiceImpl.java b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/topic/service/impl/TopicServiceImpl.java
index 6a3d4f7f2..9bd0320cd 100644
--- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/topic/service/impl/TopicServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/topic/service/impl/TopicServiceImpl.java
@@ -23,8 +23,6 @@ import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
 import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.commons.tools.constant.NumConstant;
 import com.elink.esua.epdc.commons.tools.page.PageData;
-import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
-import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.utils.DateUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
@@ -124,9 +122,7 @@ public class TopicServiceImpl extends BaseServiceImpl<TopicDao, TopicEntity> imp
 
     @Override
     public List<TopicDTO> list(Map<String, Object> params) {
-        List<TopicEntity> entityList = baseDao.selectList(getWrapper(params));
-
-        return ConvertUtils.sourceToTarget(entityList, TopicDTO.class);
+		return baseDao.selectListTopic(params);
     }
 
     private QueryWrapper<TopicEntity> getWrapper(Map<String, Object> params){