From 8d65415ae25c7d2650f9d1898b3dde6adf33e6a2 Mon Sep 17 00:00:00 2001
From: zyd <zhangyanduan@91isoft.com>
Date: Wed, 8 Jun 2022 10:36:34 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=A2=9E=E5=8A=A0=E6=97=A5=E5=BF=97=E8=BE=93?=
 =?UTF-8?q?=E5=87=BA=EF=BC=8C=E5=AF=B9=E8=BF=87=E7=A8=8B=E8=BF=9B=E8=A1=8C?=
 =?UTF-8?q?=E8=BF=BD=E8=B8=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/adc/da/scheduled/ScheduledSync.java |  2 ++
 .../DataSync/service/impl/DataSyncServiceImpl.java    | 11 ++++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledSync.java b/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledSync.java
index 97f81da3..14b4736b 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledSync.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledSync.java
@@ -28,7 +28,9 @@ public class ScheduledSync {
 
     @Async
     public void syncSchedulingTasks() {
+        log.info("======================================开始同步基础数据========================================");
         iDataSyncService.orgDataSync(); //时间短
         iDataSyncService.dataSync();    //时间长
+        log.info("======================================结束同步基础数据========================================");
     }
 }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/DataSync/service/impl/DataSyncServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/DataSync/service/impl/DataSyncServiceImpl.java
index 9b301948..d52ad7ae 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/DataSync/service/impl/DataSyncServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/DataSync/service/impl/DataSyncServiceImpl.java
@@ -124,9 +124,11 @@ public class DataSyncServiceImpl implements IDataSyncService {
                 }
             }
             if(!addUserList.isEmpty()){
+                logger.debug("本次新增的用户为："+JSONObject.toJSONString(addUserList));
                 tsUserService.saveBatch(addUserList);
             }
             if(!upUserList.isEmpty()){
+                logger.debug("本次更新的用户为："+JSONObject.toJSONString(upUserList));
                 tsUserService.updateBatchById(upUserList);
             }
         }catch(Exception e){
@@ -189,15 +191,22 @@ public class DataSyncServiceImpl implements IDataSyncService {
             }
             //需要新增的数据
             if(!addTsInstitutionList.isEmpty()){
+                logger.debug("本次新增的组织机构为："+JSONObject.toJSONString(addTsInstitutionList));
                 tsInstitutionService.saveBatch(addTsInstitutionList);
             }
             //需要更新的数据
             if(!updateTsInstitutionList.isEmpty()){
+                logger.debug("本次更新的组织机构为："+JSONObject.toJSONString(updateTsInstitutionList));
                 tsInstitutionService.updateBatchById(updateTsInstitutionList);
             }
             //需要删除的数据
             if(!delTsInstitutionList.isEmpty()){
-                tsInstitutionService.updateBatchById(delTsInstitutionList);
+                logger.debug("本次删除的组织机构为："+JSONObject.toJSONString(delTsInstitutionList));
+                List<String> delIdList = new ArrayList<>();
+                for(TsInstitution data : delTsInstitutionList){
+                    delIdList.add(data.getId());
+                }
+                tsInstitutionService.removeByIds(delIdList);
             }
         }catch(Exception e){
             logger.error(e.getMessage(),e);