选群组bug修改

epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java

@@ -0,0 +1,24 @@
+package com.epmet.constant;
+
+
+/**
+ * @author yinzuomei
+ * @dscription
+ * @date 2021/08/27 14:22
+ */
+public interface UserMessageTypeConstant {
+
+    //上传下达
+    /**
+     * 工作端发送消息,通知接收人
+     */
+    String INFO="info";
+
+    /**
+     * 居民端提交热心居民申请，通知网格长
+     */
+    String WARMHEARTED_APPLY="warmhearted_apply";
+
+
+
+}

epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/constant/UserMessageConstans.java

@@ -20,6 +20,5 @@ public interface UserMessageConstans {
 
 	String INFO_TITLE="您有一条新消息";
 
-	String MESSAGE_TYPE_INFO="info";
 	String INFO_CONTENT_TEMP="您有一条【%s】的新消息，请您查看";
 }

epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/dao/InfoGroupReceiversDao.java

@@ -20,6 +20,7 @@ package com.epmet.dao;
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.entity.InfoGroupReceiversEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.Set;
 
@@ -40,5 +41,5 @@ public interface InfoGroupReceiversDao extends BaseDao<InfoGroupReceiversEntity>
      * @author yinzuomei
      * @date 2021/8/19 10:51 上午
      */
-    Set<String> selectStaffIds(Set<String> groupIdList);
+    Set<String> selectStaffIds(@Param("groupIdList") Set<String> groupIdList);
 }

epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/InfoServiceImpl.java

@@ -27,6 +27,7 @@ import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.UserMessageConstans;
+import com.epmet.constant.UserMessageTypeConstant;
 import com.epmet.dao.*;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.AddReceiverGroupResultDTO;
@@ -159,7 +160,7 @@ public class InfoServiceImpl extends BaseServiceImpl<InfoDao, InfoEntity> implem
                     infoEntity.getContent().length() > NumConstant.FIFTY ?
                             StringUtils.substring(infoEntity.getContent(), NumConstant.ZERO,NumConstant.FORTY_NINE) : infoEntity.getContent()));
             userMessageEntity.setReadFlag(UserMessageConstans.UNREAD);
-            userMessageEntity.setMessageType(UserMessageConstans.MESSAGE_TYPE_INFO);
+            userMessageEntity.setMessageType(UserMessageTypeConstant.INFO);
             userMessageEntity.setTargetId(infoEntity.getId());
             userMessageEntity.setCreatedBy(formDTO.getUserId());
             userMessageEntity.setUpdatedBy(formDTO.getUserId());

epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/InfoGroupReceiversDao.xml

@@ -11,9 +11,13 @@
             info_group_receivers igr
         WHERE
             igr.DEL_FLAG = '0'
-          AND igr.info_receiver_group_id IN (
-                                             '1','2'
+        <if test="groupIdList != null and groupIdList.size() > 0">
+            AND igr.info_receiver_group_id IN
+            <foreach collection="groupIdList" item="groupId" separator="," open="(" close=")">
+                #{groupId}
+            </foreach>
             )
+        </if>
     </select>