Merge branch 'feature/社群' into 'developer'

Feature/社群

See merge request !814

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/chat/impl/GroupChatServiceImpl.java

@@ -247,11 +247,11 @@ public class GroupChatServiceImpl implements GroupChatService {
     public Page<GroupChatDTO> listPage(GroupChatSearchQDTO qdto, BasePageInfo basePageInfo) {
         List<TabGroupChatHmRelation> relationList = null;
         if (null != qdto.getChatHmId()) {
-            if (qdto.getIncludeOff() == 1) {
+            /*if (qdto.getIncludeOff() == 1) {
                 relationList = this.groupChatHmRelationMapper.listByChatHmIdIncludeOff(qdto.getChatHmId());
             } else {
+            }*/
             relationList = this.groupChatHmRelationMapper.listByChatHmId(qdto.getChatHmId());
-            }
             if (CollectionUtils.isEmpty(relationList)) {
                 return new Page<GroupChatDTO>();
             }

haoban-manage3-service/src/main/resources/mapper/chat/GroupChatMapper.xml

@@ -229,7 +229,7 @@
 	</select>
 	
 	<select id="listAllNeedInitWxChatIdDk" resultMap="result-map-tabHaobanGroupChat">
-		select wx_enterprise_id wxEnterpriseId , staff_id staffId from tab_haoban_group_chat where create_time >  DATE_ADD(NOW(),INTERVAL -1 day) and wx_chat_id_dk is null and init_flag = 1 and name is not null 
+		select wx_enterprise_id wxEnterpriseId , staff_id staffId from tab_haoban_group_chat where update_time >  DATE_ADD(NOW(),INTERVAL -30 day) and wx_chat_id_dk is null and init_flag = 1 and name is not null 
 		group by wx_enterprise_id , staff_id
 	</select>