From a041daa1835d563ea0f7071cb6510f23ea2efd98 Mon Sep 17 00:00:00 2001
From: wxyclub <tjzdwxy@163.com>
Date: Wed, 19 Jul 2023 17:11:02 +0800
Subject: [PATCH] =?UTF-8?q?add:=E6=B7=BB=E5=8A=A0=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E8=BE=93=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DataSync/service/impl/DataSyncServiceImpl.java     | 10 ++++++++--
 .../java/com/adc/da/sync/service/SyncUserService.java  |  4 ++--
 2 files changed, 10 insertions(+), 4 deletions(-)

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 c2faa26c..a9aab548 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
@@ -373,6 +373,7 @@ public class DataSyncServiceImpl implements IDataSyncService {
             SyncUserService syncUserService = new SyncUserService();
             List<String> res = syncUserService.syncFotonUser2(chuo);
             if(res!=null && !res.isEmpty()){
+                res.forEach(each -> logger.info("同步人员数据："+each));
                 //存放岗位信息
                 Map<String, String> positionMap = new HashMap<>();
                 TsPosition position = new TsPosition();
@@ -475,6 +476,7 @@ public class DataSyncServiceImpl implements IDataSyncService {
             SyncUserService syncUserService = new SyncUserService();
             List<String> res = syncUserService.syncFotonOrg();
             if(res!=null && !res.isEmpty()){
+                res.forEach(each -> logger.info("同步部门数据："+each));
                 //获取到所有用户数据
                 List<String> strings=new ArrayList<>();
                 //tsInstitutionService.clearData();
@@ -546,7 +548,9 @@ public class DataSyncServiceImpl implements IDataSyncService {
                     getParentTaxCompanyIds(allTsInstitutionListForPids, tsInstitution.getId(), parentIds);
                     tsInstitution.setParentIds(String.join(",",parentIds));
                 }
-                tsInstitutionService.updateBatchById(allTsInstitutionListForPids);
+                if (! allTsInstitutionListForPids.isEmpty()) {
+                    tsInstitutionService.updateBatchById(allTsInstitutionListForPids);
+                }
             }else{
                 logger.info("本次获取组织机构的数据为空，原因有2种:1、没有同步数据 2、请求接口报错");
             }
@@ -570,7 +574,9 @@ public class DataSyncServiceImpl implements IDataSyncService {
             tsInstitution.setParentIds(String.join(",",parentIds));
             logger.info(String.valueOf(tsInstitution));
         }
-        tsInstitutionService.updateBatchById(allTsInstitutionListForPids);
+        if (!allTsInstitutionListForPids.isEmpty()){
+            tsInstitutionService.updateBatchById(allTsInstitutionListForPids);
+        }
         return allTsInstitutionListForPids.toString();
     }
 
diff --git a/adc-da-sys/src/main/java/com/adc/da/sync/service/SyncUserService.java b/adc-da-sys/src/main/java/com/adc/da/sync/service/SyncUserService.java
index 031142f7..7f1d2071 100644
--- a/adc-da-sys/src/main/java/com/adc/da/sync/service/SyncUserService.java
+++ b/adc-da-sys/src/main/java/com/adc/da/sync/service/SyncUserService.java
@@ -92,7 +92,7 @@ public class SyncUserService {
             log.debug(rs);
                 JSONObject responseStr = JSON.parseObject(rs);
                 if(responseStr.containsKey("status") && responseStr.getBoolean("status")){
-                    json.add(rs);
+                    json.add("远程调用同步的员工数据："+rs);
                 }
                 if (responseStr.containsKey("cookie")) {
                     try {
@@ -138,7 +138,7 @@ public class SyncUserService {
             log.info(rs);
             JSONObject responseStr = JSONObject.parseObject(rs);
             if(responseStr.containsKey("status") && responseStr.getBoolean("status")){
-                json.add(rs);
+                json.add("远程调用同步的部门数据："+rs);
             }
             if (responseStr.containsKey("cookie")) {
                 try {