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

@@ -240,10 +240,6 @@ public class QwController {
                                         @RequestParam(value = "corpid", required = false) String corpid,
                                         @PathVariable String corpId) {
         QwCompany qwCompany = qwCompanyMapper.selectQwCompanyByCorpId(corpId);
-        if (qwCompany == null || qwCompany.getTenantId() == null) {
-            logger.error("[QwCallback] 未找到企业配置或租户ID，corpId={}", corpId);
-            return "error";
-        }
 
         try {
             return getVerifyServerAuth(msg_signature, timestamp, nonce, echostr, corpId, qwCompany);
@@ -288,11 +284,6 @@ public class QwController {
                                  @RequestParam("nonce") String nonce,
                                  @RequestParam(value = "corpid", required = false) String corpid) {
         QwCompany qwCompany = qwCompanyMapper.selectQwCompanyByCorpId(corpID);
-        if (qwCompany == null || qwCompany.getTenantId() == null) {
-            logger.error("[QwCallback] 未找到企业配置或租户ID，corpId={}", corpID);
-            return "error";
-        }
-
         try {
             logger.info("[QwCallback] 数据回调URLServerAuth-dataPost，corpId={}, tenantId={}",
                     corpID, qwCompany.getTenantId());

fs-qw-api/src/main/java/com/fs/app/service/impl/OpenQwApiServiceImpl.java

@@ -648,6 +648,12 @@ public class OpenQwApiServiceImpl implements OpenQwApiService {
                 openExternalUserid = qwApiService.getOpenExternalUserid(token1, externalUserid, corpId);
             }
             if (StringUtils.isNotBlank(openExternalUserid)) {
+                externalContact = new QwExternalContact();
+                externalContact.setUserId(qwUserId);
+                externalContact.setCorpId(corpId);
+                externalContact.setExternalUserId(openExternalUserid);
+                externalContact.setApplicationExternalUserId(externalUserid);
+                qwExternalContactMapper.updateQwExternalContactByExternalUserIdAndUserId(externalContact);
                 redisCache.setCacheObject(key, openExternalUserid);
             }
             return R.ok().put("openExternalUserid",openExternalUserid);

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

@@ -88,7 +88,7 @@ public interface QwExternalContactMapper extends BaseMapper<QwExternalContact> {
     public int batchUpdateQwExternalByIsDaysNotStudy(List<QwExternalContact> qwExternalContact);
 
 
-    @Select("SELECT * FROM qw_external_contact WHERE (external_user_id = #{externalUserId} or application_external_user_id = #{externalUserId} )AND corp_id=#{corpId} and user_id=#{qwUserId} limit 1")
+    @Select("SELECT * FROM qw_external_contact WHERE (external_user_id = #{externalUserId} or application_external_user_id = #{externalUserId} ) AND corp_id=#{corpId} and user_id=#{qwUserId} limit 1")
     public QwExternalContact selectQwExternalContactByExternalUserIdAndQwUserId(@Param("externalUserId") String externalUserId,@Param("corpId") String corpId,@Param("qwUserId") String qwUserId);
 
     @Select("<script>" +
@@ -651,4 +651,6 @@ public interface QwExternalContactMapper extends BaseMapper<QwExternalContact> {
 
     QwExternalContact selectQwExternalByApplicationExternalUserId(@Param("externalUserid")String externalUserid,
                                                                   @Param("corpId")String corpId,@Param("qwUserId") String qwUserId);
+
+    void updateQwExternalContactByExternalUserIdAndUserId(@Param("map") QwExternalContact externalContact);
 }

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

@@ -832,9 +832,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectQwExternalByApplicationExternalUserId" resultMap="QwExternalContactResult">
         <include refid="selectQwExternalContactVo"/>
         where application_external_user_id = #{externalUserid} and corp_id = #{corpId}
-        <if test="qwUserId != null and qwUserId != ''">
-            user_id = #{qwUserId}
-        </if>
+            and user_id = #{qwUserId}
         order by create_time desc limit 1
     </select>
+
+    <update id="updateQwExternalContactByExternalUserIdAndUserId" parameterType="QwExternalContact">
+        update qw_external_contact set application_external_user_id = #{map.applicationExternalUserId}
+                                   where user_id = #{map.userId} and corp_id = #{map.corpId} and external_user_id = #{map.externalUserId}
+    </update>
 </mapper>