From b24113d92b9c62e40135f4321249178d71638826 Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Mon, 18 May 2020 18:24:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=AE=AE=E9=A2=98=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E8=AF=9D=E9=A2=98=E7=9A=84=E4=BF=A1=E6=81=AF=E6=97=B6?=
 =?UTF-8?q?sql=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 epmet-gateway/pom.xml                                        | 5 +++--
 .../src/main/resources/mapper/topic/ResiTopicDao.xml         | 4 ++--
 .../src/main/java/com/epmet/controller/IssueController.java  | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/epmet-gateway/pom.xml b/epmet-gateway/pom.xml
index a9582675e3..7e8232f7fb 100644
--- a/epmet-gateway/pom.xml
+++ b/epmet-gateway/pom.xml
@@ -140,7 +140,7 @@
 <!--                <gateway.routes.resi-mine-server.uri>http://localhost:8094</gateway.routes.resi-mine-server.uri>-->
                 <gateway.routes.resi-mine-server.uri>lb://resi-mine-server</gateway.routes.resi-mine-server.uri>
                 <!--   16、居民端楼院校组             -->
-                <!--<gateway.routes.resi-group-server.uri>http://localhost:8095</gateway.routes.resi-group-server.uri>-->
+            <!--    <gateway.routes.resi-group-server.uri>http://localhost:8095</gateway.routes.resi-group-server.uri>-->
                  <gateway.routes.resi-group-server.uri>lb://resi-group-server</gateway.routes.resi-group-server.uri>
                 <!--   17、党员认证、热心居民申请             -->
 <!--                <gateway.routes.resi-partymember-server.uri>http://localhost:8096</gateway.routes.resi-partymember-server.uri>-->
@@ -158,9 +158,10 @@
                 <!--  21、居民端党群e事              -->
                 <gateway.routes.resi-hall-server.uri>lb://resi-hall-server</gateway.routes.resi-hall-server.uri>
                 <!--  22、政府工作端议题管理             -->
-                <!--<gateway.routes.gov-issue-server.uri>http://localhost:8101</gateway.routes.gov-issue-server.uri>-->
+              <!--  <gateway.routes.gov-issue-server.uri>http://localhost:8101</gateway.routes.gov-issue-server.uri>-->
                  <gateway.routes.gov-issue-server.uri>lb://gov-issue-server</gateway.routes.gov-issue-server.uri>
                 <!--  23、政府工作端项目管理             -->
+             <!--   <gateway.routes.gov-project-server.uri>http://localhost:8102</gateway.routes.gov-project-server.uri>-->
                 <gateway.routes.gov-project-server.uri>lb://gov-project-server</gateway.routes.gov-project-server.uri>
                 <!--  24、公共服务              -->
                 <gateway.routes.common-service-server.uri>lb://common-service-server</gateway.routes.common-service-server.uri>
diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml
index 46dc79434a..40a791819e 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml
+++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml
@@ -425,10 +425,10 @@
 							resi_topic_attachment attachment
 							ON
 							topic.ID = attachment.TOPIC_ID
-							WHERE
-							topic.DEL_FLAG = '0'
 							AND
 							attachment.DEL_FLAG = '0'
+							WHERE
+							topic.DEL_FLAG = '0'
 							AND
 							topic.ID = #{topicId}
 							ORDER BY
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueController.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueController.java
index 08a38bc643..c03000e354 100644
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueController.java
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueController.java
@@ -173,7 +173,7 @@ public class IssueController {
     }
 
     /**
-     * @Description  满意度评价列表——已转项目
+     * @Description  已转项目列表
      * @param formDTO
      * @author zxc
      */