Merge branch 'feature/bsl_hm_modify' into 'master'

Feature/bsl hm modify

See merge request !2319

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/chat/GroupChatUserMapper.java

@@ -94,4 +94,13 @@ public interface GroupChatUserMapper {
     List<TabGroupChatUser> getByUnionId(@Param("enterpriseId")String enterpriseId, @Param("unionid")String unionid);
 
     List<Long> listByUnionIdAndChatHmId(@Param("enterpriseId")String enterpriseId, @Param("unionid")String unionid,@Param("chatHmIdList")List<Long> chatHmIdList);
+
+    /**
+     * 根据群活码名称获取会员加入的群数量
+     * @param enterpriseId
+     * @param memberId
+     * @param hmName
+     * @return
+     */
+    int getMemberJoinChatGroupCountByHmName(@Param("enterpriseId")String enterpriseId, @Param("memberId")String memberId, @Param("hmName")String hmName);
 }
\ No newline at end of file

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

@@ -53,6 +53,13 @@ public interface GroupChatHmService {
      */
     public List<Long> listHmGroupChatId(String wxEnterpriseId, Long chatHmId) ;
 
+    /**
+     * 通过会员查询群活码列表（仅展示名称包含骑行的群活码）
+     * @param enterpriseId
+     * @param memberId
+     * @param basePageInfo
+     * @return
+     */
     Page<GroupChatHmMemberRelationDTO> memberGroupChatHmPage(String enterpriseId, String memberId, BasePageInfo basePageInfo);
 
     Integer memberJoinGroupChatHmCount(String enterpriseId, String memberId);

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

@@ -461,12 +461,14 @@ public class GroupChatHmServiceImpl implements GroupChatHmService {
                     dto.setMemberIsJoin(0);
                 }
             });
+        } else {
+            resultPage.setResult(new ArrayList<>());
         }
         return resultPage;
     }
 
     @Override
     public Integer memberJoinGroupChatHmCount(String enterpriseId, String memberId) {
-        return groupChatUserMapper.getByMember(enterpriseId, memberId).size();
+        return groupChatUserMapper.getMemberJoinChatGroupCountByHmName(enterpriseId, memberId, "骑行");
     }
 }
\ No newline at end of file

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

@@ -179,6 +179,7 @@
 		WHERE enterprise_id=#{enterpriseId}
 		and status_flag = 1
 		and delete_flag = 0
+		and name like '%骑行%'
 		order by create_time desc
 	</select>
 

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

@@ -364,5 +364,22 @@
 		and cu.unionid = #{unionid} and cu.status_flag = 1  and cu.delete_flag = 0
 	</select>
 
+	<select id="getMemberJoinChatGroupCountByHmName" resultType="java.lang.Integer">
+		select count(t2.group_chat_id)
+		from tab_haoban_group_chat_hm t1
+				 inner join tab_haoban_group_chat_hm_relation t2 on t1.chat_hm_id = t2.chat_hm_id
+				 inner join tab_haoban_group_chat_user t3 on t2.group_chat_id = t3.group_chat_id
+		where t2.status_flag = 1
+		  and t2.delete_flag = 0
+		  and t3.delete_flag = 0
+		  and t3.status_flag = 1
+		  and t1.status_flag = 1
+		  and t1.delete_flag = 0
+		  and t3.member_id is not null
+		  and t3.enterprise_id = #{enterpriseId}
+		  and t3.member_id  = #{memberId}
+		  and t1.name like CONCAT('%',#{hmName},'%')
+	</select>
+
 
 </mapper> 
\ No newline at end of file