From 7822325e7849b8f3d0a2e7c9010a6f891c254a81 Mon Sep 17 00:00:00 2001
From: liuchuang <m18800112042_2@163.com>
Date: Wed, 4 Dec 2019 14:42:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A4=BE=E7=BE=A4=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E8=B0=83=E8=AF=95=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/EventCommentServiceImpl.java |  1 +
 .../main/resources/mapper/issue/IssueDao.xml  |  2 +-
 .../dto/group/form/GroupAddUserFormDTO.java   |  2 +-
 .../dto/topic/TopicDetailDTO.java             |  2 +-
 .../group/service/impl/GroupServiceImpl.java  |  1 -
 .../service/impl/UserGroupServiceImpl.java    |  4 +--
 .../main/resources/mapper/group/GroupDao.xml  |  2 +-
 .../src/main/resources/mapper/UserDao.xml     | 31 ++++++++++---------
 8 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentServiceImpl.java
index caf235af1..c29bc2220 100755
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentServiceImpl.java
@@ -333,6 +333,7 @@ public class EventCommentServiceImpl extends BaseServiceImpl<EventCommentDao, Ev
         for (EventCommentDTO dto:
                 formDto.getComments()) {
             EventCommentEntity entity = ConvertUtils.sourceToTarget(dto, EventCommentEntity.class);
+            entity.setShieldFlag(NumConstant.ZERO_STR);
             commentEntities.add(entity);
         }
         this.insertBatch(commentEntities);
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml
index e0b2bead5..8f2a32562 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml
@@ -356,7 +356,7 @@
             issue.DEL_FLAG = '0'
             AND issue.ISSUE_STATE = 0
             AND issue.GRID_ID = #{gridId}
-            AND issue.ISSUE_CATEGORY_ID = #{categoryCode}
+            AND issue.CATEGORY_CODE = #{categoryCode}
     </select>
 
     <resultMap id="issuesAndEventsOfMineMap" type="com.elink.esua.epdc.dto.issue.result.IssuesAndEventsOfMineResultDTO">
diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/group/form/GroupAddUserFormDTO.java b/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/group/form/GroupAddUserFormDTO.java
index 1bb8c65b1..8167bd96f 100644
--- a/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/group/form/GroupAddUserFormDTO.java
+++ b/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/group/form/GroupAddUserFormDTO.java
@@ -24,5 +24,5 @@ public class GroupAddUserFormDTO implements Serializable {
     /**
      * 添加成员信息
      */
-    List<GroupUserFormDTO> groupUserFormDtoList;
+    List<GroupUserFormDTO> members;
 }
diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/topic/TopicDetailDTO.java b/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/topic/TopicDetailDTO.java
index 29a5c2201..eabb27922 100644
--- a/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/topic/TopicDetailDTO.java
+++ b/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/topic/TopicDetailDTO.java
@@ -60,7 +60,7 @@ public class TopicDetailDTO implements Serializable {
     /**
      * 所属网格详细信息
      */
-    private String ownGrid;
+    private String allDeptNames;
 
     /**
      * 图片
diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/impl/GroupServiceImpl.java b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/impl/GroupServiceImpl.java
index 9c6ba6b3f..1fbe96b92 100644
--- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/impl/GroupServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/impl/GroupServiceImpl.java
@@ -32,7 +32,6 @@ import com.elink.esua.epdc.dto.enums.GroupStateEnum;
 import com.elink.esua.epdc.dto.enums.GroupUserStateEnum;
 import com.elink.esua.epdc.dto.group.form.*;
 import com.elink.esua.epdc.dto.group.result.*;
-import com.elink.esua.epdc.dto.topic.GroupTopicUserReadDTO;
 import com.elink.esua.epdc.modules.async.NewsTask;
 import com.elink.esua.epdc.modules.group.dao.GroupDao;
 import com.elink.esua.epdc.modules.group.entity.GroupEntity;
diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/impl/UserGroupServiceImpl.java b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/impl/UserGroupServiceImpl.java
index 6019f50af..57092270c 100644
--- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/impl/UserGroupServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/impl/UserGroupServiceImpl.java
@@ -155,10 +155,10 @@ public class UserGroupServiceImpl extends BaseServiceImpl<UserGroupDao, UserGrou
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Result saveGroupUsers(GroupAddUserFormDTO formDto) {
-        List<UserGroupEntity> userGroupEntities = new ArrayList<>(formDto.getGroupUserFormDtoList().size());
+        List<UserGroupEntity> userGroupEntities = new ArrayList<>(formDto.getMembers().size());
         UserGroupEntity entity = null;
         for (GroupUserFormDTO userDto:
-                formDto.getGroupUserFormDtoList()) {
+                formDto.getMembers()) {
             entity = new UserGroupEntity();
             entity.setGroupId(formDto.getGroupId());
             entity.setUserId(userDto.getUserId());
diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/group/GroupDao.xml b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/group/GroupDao.xml
index bc5938b71..30196af13 100644
--- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/group/GroupDao.xml
+++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/group/GroupDao.xml
@@ -197,7 +197,7 @@
                 AND tcm.DEL_FLAG = '0'
             WHERE
                 tc.DEL_FLAG = '0'
-            GROUP BY
+            group by
                 tc.ID
             ) tmp ON gp.ID = tmp.GROUP_ID
         WHERE
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml
index a37ef6bd4..a21e5bcae 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml
@@ -139,32 +139,35 @@
 
     <select id="selectListOfInviteUsers" resultType="com.elink.esua.epdc.dto.epdc.result.EpdcUserGroupInviteResultDTO">
         SELECT
-        ID AS userId,
-        NICKNAME,
-        FACE_IMG AS userAvatar,
-        PARTY_FLAG AS partyMember,
-        MOBILE
+        u.ID AS userId,
+        u.NICKNAME,
+        u.FACE_IMG AS userAvatar,
+        u.PARTY_FLAG AS partyMember,
+        u.MOBILE
         FROM
-        epdc_user
+        epdc_user_grid_relation gr
+        LEFT JOIN epdc_user u ON u.ID = gr.USER_ID
+        AND u.DEL_FLAG = '0'
         WHERE
-        DEL_FLAG = '0'
-        AND GRID_ID = #{gridId}
-        AND ID NOT IN
+        gr.DEL_FLAG = '0'
+        AND gr.GRID_ID = #{gridId}
+        AND u.ID IS NOT NULL
+        AND gr.USER_ID NOT IN
         <foreach item="userId" collection="userIds" open="(" separator="," close=")">
             #{userId}
         </foreach>
         <if test="mobile != null and mobile != ''">
-            and MOBILE = #{mobile}
+            and u.MOBILE = #{mobile}
         </if>
         <if test="road != null and road != ''">
-            and ROAD like concat('%', #{road}, '%')
+            and u.ROAD like concat('%', #{road}, '%')
         </if>
         <if test="lastName != null and lastName != ''">
-            and LAST_NAME like concat('%', #{lastName}, '%')
+            and u.LAST_NAME like concat('%', #{lastName}, '%')
         </if>
         ORDER BY
-        CONVERT(NICKNAME USING gbk) ASC,
-        REGISTER_TIME
+        CONVERT ( u.NICKNAME USING gbk ) ASC,
+        u.REGISTER_TIME
     </select>
 
     <resultMap id="partMemberDetail" type="com.elink.esua.epdc.dto.epdc.result.EpdcPartyMemberDetailDto">