1.修改恒春来侧边栏查询语句

fs-qwhook-sop/src/main/java/com/fs/app/controller/FsUserCourseVideoController.java

@@ -124,8 +124,8 @@ public class FsUserCourseVideoController {
         if (qwUser == null || qwUser.getCompanyId() == null) {
             return R.error("员工未绑定 销售公司 或 未获取到员工信息，请重试！");
         }
-        String externalUserId = param.getExternalUserId();
-        QwExternalContact qwExternalContact = qwExternalContactService.selectQwExternalContactByExternalUserIdSidebar(externalUserId, param.getCorpId());
+        param.setCompanyUserId(qwUser.getCompanyUserId());
+        QwExternalContact qwExternalContact = qwExternalContactService.selectQwExternalContactByExternalUserIdSidebar(param);
 
         if(qwExternalContact == null || qwExternalContact.getFsUserId() == null){
             return R.error("用户未绑定，暂时无法下单");
@@ -293,8 +293,7 @@ public class FsUserCourseVideoController {
     @GetMapping("/getStoreOrderListBySidebar")
     public R getStoreOrderListBySidebar(FsStoreOrderScrmSidebarVO param){
 
-        String externalUserId = param.getExternalUserId();
-        QwExternalContact qwExternalContact = qwExternalContactService.selectQwExternalContactByExternalUserIdSidebar(externalUserId, param.getCorpId());
+        QwExternalContact qwExternalContact = qwExternalContactService.selectQwExternalContactByExternalUserIdSidebar(param);
 
         if(qwExternalContact == null || qwExternalContact.getFsUserId() == null){
             return R.error("用户未绑定，无法查询订单");

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.fs.common.annotation.DataSource;
 import com.fs.common.enums.DataSourceType;
 import com.fs.fastGpt.domain.FastgptChatArtificialWords;
+import com.fs.hisStore.vo.FsStoreOrderScrmSidebarVO;
 import com.fs.qw.domain.QwExternalContact;
 import com.fs.qw.domain.QwUserDelLossLog;
 import com.fs.qw.param.*;
@@ -649,7 +650,7 @@ public interface QwExternalContactMapper extends BaseMapper<QwExternalContact> {
             "</script>")
     public int batchUpdateQwExternalContactMandatoryRegistration(@Param("map") List<QwMandatoryRegistrParam> batchList);
 
-    QwExternalContact selectQwExternalContactByExternalUserIdSidebar(@Param("externalUserId") String externalUserId, @Param("corpId") String corpId);
+    QwExternalContact selectQwExternalContactByExternalUserIdSidebar(@Param("param") FsStoreOrderScrmSidebarVO param);
 
     @Select("SELECT " +
             "id " +

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

@@ -4,6 +4,7 @@ package com.fs.qw.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.fs.common.core.domain.R;
 import com.fs.course.param.FsCourseListBySidebarParam;
+import com.fs.hisStore.vo.FsStoreOrderScrmSidebarVO;
 import com.fs.qw.domain.QwExternalContact;
 import com.fs.qw.domain.QwUser;
 import com.fs.qw.param.*;
@@ -269,5 +270,5 @@ public interface IQwExternalContactService extends IService<QwExternalContact> {
     /**
      * 企微用户-查询外部联系人信息
      */
-    QwExternalContact selectQwExternalContactByExternalUserIdSidebar(String externalUserId, String corpId);
+    QwExternalContact selectQwExternalContactByExternalUserIdSidebar(FsStoreOrderScrmSidebarVO param);
 }

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

@@ -34,6 +34,7 @@ import com.fs.crm.mapper.CrmCustomerMapper;
 import com.fs.his.domain.FsUser;
 import com.fs.his.mapper.FsUserMapper;
 import com.fs.his.utils.PhoneUtil;
+import com.fs.hisStore.vo.FsStoreOrderScrmSidebarVO;
 import com.fs.qw.domain.*;
 import com.fs.qw.mapper.*;
 import com.fs.qw.param.*;
@@ -6011,8 +6012,8 @@ public class QwExternalContactServiceImpl extends ServiceImpl<QwExternalContactM
     }
 
     @Override
-    public QwExternalContact selectQwExternalContactByExternalUserIdSidebar(String externalUserId, String corpId) {
-        return qwExternalContactMapper.selectQwExternalContactByExternalUserIdSidebar(externalUserId,corpId);
+    public QwExternalContact selectQwExternalContactByExternalUserIdSidebar(FsStoreOrderScrmSidebarVO param) {
+        return qwExternalContactMapper.selectQwExternalContactByExternalUserIdSidebar(param);
     }
 
     @Override

fs-service/src/main/resources/mapper/qw/QwExternalContactMapper.xml

@@ -819,7 +819,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectQwExternalContactByExternalUserIdSidebar"
             resultMap="QwExternalContactResult">
         <include refid="selectQwExternalContactVo"/>
-        where corp_id = #{corpId} and external_user_id = #{externalUserId}
+        where corp_id = #{param.corpId} and external_user_id = #{param.externalUserId}
+        and company_user_id = #{param.companyUserId}
         and user_id is not null and company_id is not null
         limit 1
     </select>