Merge branch 'saas-api' of http://1.14.104.71:10880/txl/ylrz_saas_his_scrm into saas-api

fs-company/src/main/java/com/fs/company/controller/qw/QwGroupChatController.java

@@ -12,7 +12,9 @@ import com.fs.common.utils.ServletUtils;
 import com.fs.company.service.impl.CompanyDeptServiceImpl;
 import com.fs.framework.security.LoginUser;
 import com.fs.framework.service.TokenService;
+import com.fs.qw.domain.QwCompany;
 import com.fs.qw.param.QwGroupChatParam;
+import com.fs.qw.service.IQwCompanyService;
 import com.fs.qw.service.IQwGroupChatService;
 import com.fs.qw.vo.QwGroupChatOptionsVO;
 import com.fs.qw.vo.QwGroupChatVO;
@@ -46,6 +48,8 @@ public class QwGroupChatController extends BaseController
 
     @Autowired
     private CompanyDeptServiceImpl companyDeptService;
+    @Autowired
+    private IQwCompanyService qwCompanyService;
 
     /** HTTP调用超时时间（秒） */
     @Value("${qw.api.timeout:30}")
@@ -101,8 +105,15 @@ public class QwGroupChatController extends BaseController
     public TableDataInfo myList(QwGroupChatParam qwGroupChat)
     {
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
-        if (qwGroupChat.getCompanyId() == null && loginUser.getCompany() != null) { qwGroupChat.setCompanyId(loginUser.getCompany().getCompanyId()); };
-        qwGroupChat.setCompanyUserId(loginUser.getUser().getUserId());
+        if (qwGroupChat.getCompanyId() == null) {
+            //查询qw_company
+            QwCompany qwCompany = qwCompanyService.selectQwCompanyByCorpId(qwGroupChat.getCorpId());
+            qwGroupChat.setCompanyId(qwCompany.getId());
+        }
+        if (qwGroupChat.getCompanyUserId() == null && loginUser != null){
+            qwGroupChat.setCompanyUserId(loginUser.getUser().getUserId());
+        }
+
         startPage();
         List<QwGroupChatVO> list = qwGroupChatService.selectQwGroupChatList(qwGroupChat);
         return getDataTable(list);

fs-qw-api/src/main/java/com/fs/app/controller/QwGroupChatController.java

@@ -67,7 +67,7 @@ public class QwGroupChatController extends BaseController {
             log.info("[GroupChat] 同步我的客户群信息，tenantId={}, corpId={}, companyUserId={}", tenantId, corpId, companyUserId);
             return tenantDataSourceUtil.executeWithResult(tenantId, () -> {
                 try {
-                    List<String> qwUserIdList = iQwUserService.selectQwUserListByCompanyUserId(companyUserId, corpId);
+                    List<String> qwUserIdList = iQwUserService.selectQwOpenUserListByCompanyUserId(companyUserId, corpId);
                     return qwGroupChatService.cogradientGroupChat(corpId, qwUserIdList);
                 } catch (Exception e) {
                     log.error("[GroupChat] 同步我的客户群信息异常", e);

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

@@ -48,7 +48,7 @@ public interface QwGroupChatMapper
             "FROM " +
             "    qw_group_chat gc " +
             "LEFT JOIN qw_group_chat_user gcu ON gc.chat_id = gcu.chat_id  " +
-            " left join qw_user qu on gc.owner=qu.qw_user_id  and qu.is_del=0 and qu.corp_id=gc.corp_id " +
+            " left join qw_user qu on gc.owner=qu.qw_open_user_id  and qu.is_del=0 and qu.corp_id=gc.corp_id " +
             " left join company_user cu on cu.qw_user_id=qu.id " +
             "    AND gc.corp_id = gcu.corp_id  " +
             "<where> " +
@@ -63,7 +63,7 @@ public interface QwGroupChatMapper
             "             <if test=\"map.corpId != null  and map.corpId != ''\"> and gc.corp_id = #{map.corpId}</if>" +
             "             <if test=\"map.corpId != null  and map.corpId != ''\"> and qu.corp_id = #{map.corpId}</if>" +
             "             <if test=\"map.qwUserList != null  and map.qwUserList != ''\"> " +
-            "           and gc.owner in " +
+            "           and qu.qw_user_id in " +
             "                   <foreach  item='item' index='index' collection='qwUserIds' open='(' separator=',' close=')'> #{item}   </foreach> " +
             "           </if>" +
             "            <if test=\"map.cuDeptIdList != null and !map.cuDeptIdList.isEmpty() and  map.userType != '00' \">" +

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

@@ -423,6 +423,9 @@ public interface QwUserMapper extends BaseMapper<QwUser>
     @Select("select qw_user_id from qw_user where company_user_id = #{userId} and corp_id = #{corpId}")
     List<String> selectQwUserListByCompanyUserId(@Param("userId") Long userId,@Param("corpId") String corpId);
 
+    @Select("select qw_open_user_id from qw_user where company_user_id = #{userId} and corp_id = #{corpId}")
+    List<String> selectQwOpenUserListByCompanyUserId(@Param("userId") Long userId,@Param("corpId") String corpId);
+
     @Select("<script>" +
             "select qu.id from qw_user qu " +
             "left join company_user cu on cu.user_id=qu.company_user_id " +

fs-service/src/main/java/com/fs/qw/service/IQwUserService.java

@@ -165,6 +165,7 @@ public interface IQwUserService
     List<QwWorkTask> selectQwWorkTaskList(SelectQwWorkTaskListParam param);
 
     List<String> selectQwUserListByCompanyUserId(Long userId,String corpId );
+    List<String> selectQwOpenUserListByCompanyUserId(Long userId, String corpId);
     List<Long> selectQwUserListByCuDeptIdList(QwSop qwSop);
 
 

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

@@ -282,6 +282,14 @@ public class QwUserServiceImpl implements IQwUserService
 
     }
 
+    @Override
+    public List<String> selectQwOpenUserListByCompanyUserId(Long userId, String corpId) {
+        return qwUserMapper.selectQwOpenUserListByCompanyUserId(userId,corpId);
+
+    }
+
+
+
     @Override
     public List<Long> selectQwUserListByCuDeptIdList(QwSop qwSop) {
         return qwUserMapper.selectQwUserListByCuDeptIdList(qwSop);
@@ -946,7 +954,7 @@ public class QwUserServiceImpl implements IQwUserService
         QwCompany qwCompany = iQwCompanyService.selectQwCompanyByCorpId(corpId);
         for (DeptUser user : deptUser) {
             String userid = user.getUserid();
-            String openUserIdRedisKey = "corpId:" + userid;
+            String openUserIdRedisKey = "corpId:" + corpId + userid;
             String  redisResult= redisCache.getCacheObject(openUserIdRedisKey);
             String openUserId = "";
             if (StringUtils.isNotBlank(redisResult)){

fs-service/src/main/java/com/fs/qwApi/service/impl/QwApiServiceImpl.java

@@ -928,7 +928,7 @@ public class QwApiServiceImpl implements QwApiService {
 
     @Override
     public String getOpenUserid(String accessToken,String userId,String corpId) {
-        String openUserIdRedisKey = "corpId:" + userId;
+        String openUserIdRedisKey = "corpId:" + corpId + userId;
         String  redisResult= redisCache.getCacheObject(openUserIdRedisKey);
         if(StringUtils.isNotBlank(redisResult)){
             return redisResult;
@@ -973,7 +973,7 @@ public class QwApiServiceImpl implements QwApiService {
 
     @Override
     public String getOpenExternalUserid(String accessToken,String userId,String corpId) {
-        String openUserIdRedisKey = "externalUserid:corpId:" + userId;
+        String openUserIdRedisKey = "externalUserid:corpId:" + corpId + userId;
         String  redisResult= redisCache.getCacheObject(openUserIdRedisKey);
         if(StringUtils.isNotBlank(redisResult)){
             return redisResult;