From 0c7b4455c4bc79e4c9c6e77900de1a4dd535cf0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=96=9B=E5=AE=87?= <2433098676@qq.com>
Date: Tue, 18 Jul 2023 09:38:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E8=AE=BE=E7=BD=AE=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=EF=BC=8C=E5=90=8C=E6=AD=A5=E8=87=B3=E8=87=AA=E5=8A=A9?=
 =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E6=88=96=E7=AE=A1=E7=90=86=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E7=9A=84=E6=89=AB=E7=A0=81=E5=8D=95=E6=8D=AE=E5=8F=AA=E8=83=BD?=
 =?UTF-8?q?=E5=8D=95=E7=BA=BF=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../glxp/api/controller/sync/SyncDataSetController.java   | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/main/java/com/glxp/api/controller/sync/SyncDataSetController.java b/src/main/java/com/glxp/api/controller/sync/SyncDataSetController.java
index dbf15d44c..ed63fc404 100644
--- a/src/main/java/com/glxp/api/controller/sync/SyncDataSetController.java
+++ b/src/main/java/com/glxp/api/controller/sync/SyncDataSetController.java
@@ -1,6 +1,7 @@
 package com.glxp.api.controller.sync;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.IdUtil;
 import cn.hutool.json.JSONUtil;
 import com.glxp.api.annotation.AuthRuleAnnotation;
 import com.glxp.api.constant.Constant;
@@ -65,12 +66,19 @@ public class SyncDataSetController {
         syncDataSetEntity.setUpdateTime(new Date());
         syncDataSetEntity.setId(1);
         List<SyncDataBustypeEntity> busTypes = syncDataSetResponse.getBusTypes();
+        //重新生成id防止插入时单据类型被覆盖
+        for (SyncDataBustypeEntity s:busTypes) {
+            s.setId(IdUtil.getSnowflakeNextId());
+        }
         syncDataBustypeService.deleteAll(1);
         if (CollUtil.isNotEmpty(busTypes)) {
             syncDataBustypeService.inserts(busTypes);
         }
 
         List<SyncDataBustypeEntity> toInBusTypes = syncDataSetResponse.getToInBusTypes();
+        for (SyncDataBustypeEntity s : toInBusTypes) {
+            s.setId(IdUtil.getSnowflakeNextId());
+        }
         syncDataBustypeService.deleteAll(2);
         if (CollUtil.isNotEmpty(toInBusTypes)) {
             syncDataBustypeService.inserts(toInBusTypes);