Sfoglia il codice sorgente

自动打标签,自动打备注调试处理

yys 2 mesi fa
parent
commit
b7172f747a

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

@@ -42,11 +42,6 @@ public class QwController {
                        @RequestParam("nonce") String nonce,
                        @RequestParam("echostr") String echostr) {
         QwCompany qwCompany = qwCompanyMapper.selectQwCompanyByCorpId(corpId);
-        if (qwCompany == null || qwCompany.getTenantId() == null) {
-            logger.error("[QwCallback] 未找到企业配置或租户ID,corpId={}", corpId);
-            return "error";
-        }
-
         try {
             return getVerify(msg_signature, timestamp, nonce, echostr, corpId, qwCompany);
         } catch (Exception e) {
@@ -65,10 +60,6 @@ public class QwController {
                         @RequestParam("nonce") String nonce) {
         logger.error("corpid={}", corpId);
         QwCompany qwCompany = qwCompanyMapper.selectQwCompanyByCorpId(corpId);
-        if (qwCompany == null || qwCompany.getTenantId() == null) {
-            logger.error("[QwCallback] 未找到企业配置或租户ID,corpId={}", corpId);
-            return "error";
-        }
 
         try {
             return dataCallback(msg_signature, timestamp, nonce, requestBody, corpId, qwCompany);

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

@@ -2528,7 +2528,7 @@ public class QwExternalContactServiceImpl extends ServiceImpl<QwExternalContactM
         }
 
         for (FollowUser followUser : followUsers) {
-            if (followUser.getUserid().equals(userID)) {
+            if (followUser.getUserid().equals(qwUser.getQwOpenUserid())) {
                 qwExternalContact.setUserId(followUser.getUserid()); // 设置属于用户ID
                 qwExternalContact.setExternalUserId(externalContact.getExternal_userid()); // 设置外部联系人ID
                 if (qwUser != null) {
@@ -2586,7 +2586,7 @@ public class QwExternalContactServiceImpl extends ServiceImpl<QwExternalContactM
 
                 //添加的标签
                 QwEditUserTagParam qwEditUserTagParam = new QwEditUserTagParam();
-                qwEditUserTagParam.setUserid(userID);
+                qwEditUserTagParam.setUserid(qwUser.getQwOpenUserid());
                 qwEditUserTagParam.setExternal_userid(externalUserID);
                 //添加标签的日志记录
                 QwAutoTagsLogs qwAutoTagsLogs = new QwAutoTagsLogs();
@@ -2822,7 +2822,7 @@ public class QwExternalContactServiceImpl extends ServiceImpl<QwExternalContactM
                         qwExternalContact.setRemark(tagRemark + "-" + externalContact.getName());
                         QwExternalContactRemarkParam param = new QwExternalContactRemarkParam();
                         param.setRemark(qwExternalContact.getRemark());
-                        param.setUserid(userID);
+                        param.setUserid(qwUser.getQwOpenUserid());
                         param.setExternal_userid(externalUserID);
                         QwExternalContactRemarkResult remarkResult = qwApiService.externalcontactRemark(param, qwExternalContact.getCorpId());