From 5b95cde03c72d9ad61d65713bf755006d9a35ebe Mon Sep 17 00:00:00 2001
From: YXY <932687738@qq.com>
Date: Tue, 5 Sep 2023 20:57:12 +0800
Subject: [PATCH] =?UTF-8?q?=E7=95=85=E6=8D=B7=E9=80=9A=E5=90=8C=E6=AD=A5?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=94=AF=E4=B8=80=E9=94=AE=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=A1=A8id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../quartz/task/CJT/SyncAccountsJobAbstract.java     | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CJT/SyncAccountsJobAbstract.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CJT/SyncAccountsJobAbstract.java
index 29399ae..1e61bca 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CJT/SyncAccountsJobAbstract.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CJT/SyncAccountsJobAbstract.java
@@ -354,7 +354,7 @@ public abstract class SyncAccountsJobAbstract {
                 //实际返回数据
                 rows = response.getRows();
                 if (!CollectionUtils.isEmpty(rows)) {
-                    Map<String, String> existKeyMap = getExistKeyMap(cjtRequest, response.getColumns(), rows, context.getCjt());
+                    Map<String, String> existKeyMap = getExistKeyMap(cjtRequest, response.getColumns(), rows, context.getCjt(),addRecordRequest);
                     //批量同步飞书
                     List<String> errorCodeList = syncLarkBatch(response.getColumns(), rows, existKeyMap, addRecordRequest, context.getCjt(),context.getAsynchronous());
                     if (!CollectionUtils.isEmpty(errorCodeList)) {
@@ -374,7 +374,7 @@ public abstract class SyncAccountsJobAbstract {
         }
     }
 
-    private List<String> getUniqueKey(List<String> keyList, List<List<String>> rows, String cjt) {
+    private List<String> getUniqueKey(List<String> keyList, List<List<String>> rows, String cjt, LarkTableRequest addRecordRequest ) {
 //组成唯一键的集合
         List<String> uniqueFields = getUniqueFields(cjt);
         List<String> result = new ArrayList<>();
@@ -386,7 +386,7 @@ public abstract class SyncAccountsJobAbstract {
                         midList.add(row.get(i));
                     }
                 }
-                String uniqueKey = String.join("_", midList).toUpperCase();
+                String uniqueKey = String.join("_", midList).toUpperCase() + addRecordRequest.getAppTable();
                 result.add(uniqueKey);
             }
         }
@@ -396,11 +396,11 @@ public abstract class SyncAccountsJobAbstract {
     /**
      * 使用唯一key区分创建或更新
      */
-    protected Map<String, String> getExistKeyMap(CJTRequest req, List<String> keyList, List<List<String>> rows, String cjt) {
+    protected Map<String, String> getExistKeyMap(CJTRequest req, List<String> keyList, List<List<String>> rows, String cjt, LarkTableRequest addRecordRequest) {
         if (CollectionUtils.isEmpty(rows)) {
             return new HashMap<>();
         }
-        List<String> uniqueKeyList = getUniqueKey(keyList, rows, cjt);
+        List<String> uniqueKeyList = getUniqueKey(keyList, rows, cjt,addRecordRequest);
         if (CollectionUtils.isEmpty(uniqueKeyList)) {
             return new HashMap<>();
         }
@@ -456,7 +456,7 @@ public abstract class SyncAccountsJobAbstract {
                     }
                     body.put(larkLabel, this.changeValueType(value, cjtSyncTypeRelation));
                 }
-                uniqueKey = String.join("_", uniqueKeyList).toUpperCase();
+                uniqueKey = String.join("_", uniqueKeyList).toUpperCase()+addRecordRequest.getAppTable();
                 if (repeatMap.containsKey(uniqueKey)) {
                     continue;
                 }