社群模块修改所属网格字段名称

esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/group/GroupActivityDTO.java

@@ -23,5 +23,5 @@ public class GroupActivityDTO implements Serializable {
     /**
      * 所属网格
      */
-    private String ownGrid;
+    private String allDeptNames;
 }

esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/group/GroupMemberDTO.java

@@ -25,5 +25,5 @@ public class GroupMemberDTO implements Serializable {
     /**
      * 所属网格
      */
-    private String ownGrid;
+    private String allDeptNames;
 }

esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/group/GroupDao.xml

@@ -184,7 +184,7 @@
     <select id="selectListOfGroupOrderByActivity" resultType="com.elink.esua.epdc.dto.group.GroupActivityDTO">
         SELECT
             gp.GROUP_NAME,
-            CONCAT( gp.AREA, gp.STREET, gp.COMMUNITY, gp.GRID ) AS ownGrid
+            gp.ALL_DEPT_NAMES
         FROM
             epdc_group gp
             LEFT JOIN (
@@ -231,7 +231,7 @@
         CASE
             WHEN COUNT( up.ID ) IS NULL THEN
             0 ELSE COUNT( up.ID ) END AS memberNum,
-            CONCAT( gp.AREA, gp.STREET, gp.COMMUNITY, gp.GRID ) AS ownGrid
+            gp.ALL_DEPT_NAMES
         FROM
             epdc_group gp
             LEFT JOIN epdc_user_group up ON gp.ID = up.GROUP_ID

esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/topic/TopicDao.xml

@@ -242,7 +242,7 @@
         <result property="topicLatitude" column="TOPIC_LATITUDE"/>
         <result property="topicLongitude" column="TOPIC_LONGITUDE"/>
         <result property="groupName" column="GROUP_NAME"/>
-        <result property="ownGrid" column="ownGrid"/>
+        <result property="allDeptNames" column="ALL_DEPT_NAMES"/>
         <collection property="images" ofType="java.lang.String">
             <result property="image" column="IMG_URL"/>
         </collection>
@@ -257,7 +257,7 @@
             tp.TOPIC_LATITUDE,
             tp.TOPIC_LONGITUDE,
             tp.GROUP_NAME,
-            CONCAT( tp.AREA, tp.STREET, tp.COMMUNITY, tp.GRID ) AS ownGrid,
+            tp.ALL_DEPT_NAMES,
             img.IMG_URL
         FROM
             epdc_topic tp