From 6e702d549c451fc10d18dd295bdacc50684aec08 Mon Sep 17 00:00:00 2001
From: anthonyywj2 <353682448@qq.com>
Date: Thu, 4 Aug 2022 09:53:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=90=8C=E6=AD=A5=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E9=83=A8=E9=97=A8=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../glxp/sale/admin/entity/auth/DeptEntity.java   | 15 +++++++++++++++
 .../sale/admin/res/sync/SpsSyncDataResponse.java  |  6 ++++++
 .../glxp/sale/admin/thread/DlAllDataService.java  |  3 ++-
 3 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 api-admin/src/main/java/com/glxp/sale/admin/entity/auth/DeptEntity.java

diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/auth/DeptEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/auth/DeptEntity.java
new file mode 100644
index 0000000..731d63f
--- /dev/null
+++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/auth/DeptEntity.java
@@ -0,0 +1,15 @@
+package com.glxp.sale.admin.entity.auth;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class DeptEntity {
+    private String code;
+    private Integer id;
+    private String name;
+    private String remark;
+    private Integer flag;
+    private Date updateTime;
+}
diff --git a/api-admin/src/main/java/com/glxp/sale/admin/res/sync/SpsSyncDataResponse.java b/api-admin/src/main/java/com/glxp/sale/admin/res/sync/SpsSyncDataResponse.java
index b63dacd..977e3c4 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/res/sync/SpsSyncDataResponse.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/res/sync/SpsSyncDataResponse.java
@@ -2,6 +2,7 @@ package com.glxp.sale.admin.res.sync;
 
 import cn.hutool.core.collection.CollUtil;
 import com.glxp.sale.admin.entity.auth.AuthAdmin;
+import com.glxp.sale.admin.entity.auth.DeptEntity;
 import com.glxp.sale.admin.entity.info.CompanyProductRelevanceEntity;
 import com.glxp.sale.admin.entity.info.WarehouseBussinessTypeEntity;
 import com.glxp.sale.admin.entity.info.WarehouseUserEntity;
@@ -30,6 +31,7 @@ public class SpsSyncDataResponse {
     List<WarehouseBussinessTypeEntity> warehouseBussinessTypeEntities;
     List<WarehouseUserEntity> warehouseUserEntities;
     List<AuthAdmin> authAdminList;
+    List<DeptEntity> deptEntityList;
 
     @Override
     public String toString() {
@@ -85,6 +87,10 @@ public class SpsSyncDataResponse {
         if (CollUtil.isNotEmpty(authAdminList)) {
             remark.append("用户信息：").append(authAdminList.size()).append(" 条\n");
         }
+
+        if (CollUtil.isNotEmpty(deptEntityList)) {
+            remark.append("部门信息：").append(deptEntityList.size()).append(" 条\n");
+        }
         return remark.toString();
     }
 }
diff --git a/api-admin/src/main/java/com/glxp/sale/admin/thread/DlAllDataService.java b/api-admin/src/main/java/com/glxp/sale/admin/thread/DlAllDataService.java
index b061ccc..5d86e86 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/thread/DlAllDataService.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/thread/DlAllDataService.java
@@ -80,7 +80,8 @@ public class DlAllDataService {
                                         || CollUtil.isNotEmpty(syncOrderResponse.getThrProductsEntities())
                                         || CollUtil.isNotEmpty(syncOrderResponse.getUdiInfoEntities())
                                         || CollUtil.isNotEmpty(syncOrderResponse.getUdiRelevanceEntities())
-                                        || CollUtil.isNotEmpty(syncOrderResponse.getAuthAdminList()))
+                                        || CollUtil.isNotEmpty(syncOrderResponse.getAuthAdminList())
+                                        || CollUtil.isNotEmpty(syncOrderResponse.getDeptEntityList()))
                         ) {
 
                             String key = gennerOrderUtils.getAllProducts();