Merge remote-tracking branch 'origin/saas-api' into saas-api

fs-service/src/main/java/com/fs/qw/mapper/QwGroupChatMapper.java

@@ -117,8 +117,8 @@ public interface QwGroupChatMapper
     @Select("select chat_id,name from qw_group_chat where  corp_id=#{corpId}")
     List<QwGroupChatOptionsVO> selectGroupChatOptionsVOList(String corpId);
 
-    @Select("select chat_id,name from qw_group_chat where corp_id = #{corpId} and find_in_set(owner,#{qwUserIds})")
-    List<QwGroupChatOptionsVO> listAllByQwUserList(@Param("qwUserIds") String qwUserIds, @Param("corpId") String corpId);
+    @Select("select chat_id,name from qw_group_chat where corp_id = #{corpId} and find_in_set(owner,#{qwOpenUserIds})")
+    List<QwGroupChatOptionsVO> listAllByQwUserList(@Param("qwOpenUserIds") String qwOpenUserIds, @Param("corpId") String corpId);
 
     List<QwGroupChat> selectQwGroupChatByChatIds(@Param("ids") String[] ids);
 

fs-service/src/main/java/com/fs/qw/mapper/QwUserMapper.java

@@ -521,4 +521,7 @@ public interface QwUserMapper extends BaseMapper<QwUser>
     // 批量更新
     int batchUpdateQwUser(@Param("list") List<QwUser> users);
 
+    @Select("select group_concat(qw_open_user_id) from qw_user where corp_id = #{corpId} and find_in_set(qw_user_id, #{qwUserIds})")
+    String selectQwOpenUserIdByQwUserIdAndCorpId(@Param("qwUserIds") String qwUserIds, @Param("corpId") String corpId);
+
 }

fs-service/src/main/java/com/fs/qw/service/impl/QwGroupChatServiceImpl.java

@@ -413,7 +413,11 @@ public class QwGroupChatServiceImpl implements IQwGroupChatService
 
     @Override
     public List<QwGroupChatOptionsVO> listAllByQwUserList(String qwUserIds, String corpId, String sopId) {
-        List<QwGroupChatOptionsVO> list = qwGroupChatMapper.listAllByQwUserList(qwUserIds, corpId);
+
+        // qwUserIds 转换为  qwOpenUserIds
+        String qwOpenUserIds = qwUserMapper.selectQwOpenUserIdByQwUserIdAndCorpId(qwUserIds, corpId);
+
+        List<QwGroupChatOptionsVO> list = qwGroupChatMapper.listAllByQwUserList(qwOpenUserIds, corpId);
         if(StringUtils.isNotEmpty(sopId)){
             QwSop qwSop = sopMapper.selectQwSopById(sopId);
             List<String> chatIds;