From f84273e92bee5ade1f060a7aeaf94bfd4435bede Mon Sep 17 00:00:00 2001
From: sjh <shujiehao@foxmail.com>
Date: Tue, 22 Oct 2024 09:07:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A8=A1=E5=9E=8B1=EF=BC=9A?=
 =?UTF-8?q?=E6=A1=88=E4=BB=B6=E8=AD=A6=E6=83=85=E7=96=91=E4=BC=BC=E6=9C=AA?=
 =?UTF-8?q?=E5=8F=8A=E6=97=B6=E5=8F=97=E7=90=86=E6=A1=88=E4=BB=B6=EF=BC=8C?=
 =?UTF-8?q?=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supervision/mapper/ModelClueDataMapper.java   |  2 +-
 .../pojo/entity/SupExternalDepart.java            |  4 ++++
 .../service/SupExternalDepartService.java         | 15 +++++++++------
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/biutag/supervision/mapper/ModelClueDataMapper.java b/src/main/java/com/biutag/supervision/mapper/ModelClueDataMapper.java
index 375a655..555f43d 100644
--- a/src/main/java/com/biutag/supervision/mapper/ModelClueDataMapper.java
+++ b/src/main/java/com/biutag/supervision/mapper/ModelClueDataMapper.java
@@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Select;
 import java.util.List;
 import java.util.Map;
 
-@DS("slave2")
+@DS("slave2")   // 该注解勿动
 public interface ModelClueDataMapper extends BaseMapper<ModelClue> {
 
     @Select("${sql}")
diff --git a/src/main/java/com/biutag/supervision/pojo/entity/SupExternalDepart.java b/src/main/java/com/biutag/supervision/pojo/entity/SupExternalDepart.java
index 5b02af3..a1f3065 100644
--- a/src/main/java/com/biutag/supervision/pojo/entity/SupExternalDepart.java
+++ b/src/main/java/com/biutag/supervision/pojo/entity/SupExternalDepart.java
@@ -40,6 +40,10 @@ public class SupExternalDepart {
     @TableField("internal_short_name")
     private String internalShortName;
 
+    // 状态：0-启用，1-禁用
+    @TableField("status")
+    private Integer status;
+
     // 创建时间
     @TableField("create_time")
     private LocalDateTime createTime;
diff --git a/src/main/java/com/biutag/supervision/service/SupExternalDepartService.java b/src/main/java/com/biutag/supervision/service/SupExternalDepartService.java
index 2a4e780..7aa0d85 100644
--- a/src/main/java/com/biutag/supervision/service/SupExternalDepartService.java
+++ b/src/main/java/com/biutag/supervision/service/SupExternalDepartService.java
@@ -46,6 +46,7 @@ public class SupExternalDepartService extends ServiceImpl<SupExternalDepartMappe
                 supExternalDepart.setInternalId(supDepart.getId());
                 supExternalDepart.setInternalName(supDepart.getName());
                 supExternalDepart.setInternalShortName(supDepart.getShortName());
+                supExternalDepart.setStatus(0);
                 supExternalDepart.setCreateTime(LocalDateTime.now());
             }
         }
@@ -56,9 +57,9 @@ public class SupExternalDepartService extends ServiceImpl<SupExternalDepartMappe
         List<GBaseJJD> gBaseJJDS = gBaseJJDMapper.selectList(new QueryWrapper<GBaseJJD>().select("DISTINCT gxdwdm, gxdwmc"));
         if (!gBaseJJDS.isEmpty()) {
             gBaseJJDS.forEach(item -> {
-                if (item != null && !dms.contains(item.getGxdwdm())) {
+                if (item != null && !dms.contains(item.getGxdwdm()) && item.getGxdwdm() != null && !item.getGxdwdm().isEmpty()) {
                     SupExternalDepart supExternalDepart = new SupExternalDepart();
-                    supExternalDepart.setExternalId(item.getGxdwdm() == null ? "" : item.getGxdwdm());
+                    supExternalDepart.setExternalId(item.getGxdwdm());
                     supExternalDepart.setExternalName(item.getGxdwmc() == null ? "" : item.getGxdwmc());
                     dms.add(item.getGxdwdm());
                     supExternalDepart.setSource("情指行");
@@ -69,9 +70,9 @@ public class SupExternalDepartService extends ServiceImpl<SupExternalDepartMappe
         List<GBaseCJD> gBaseCJDS = gBaseCJDMapper.selectList(new QueryWrapper<GBaseCJD>().select("DISTINCT cjdxssdwdm, cjdxssdwmc"));
         if (!gBaseCJDS.isEmpty()) {
             gBaseCJDS.forEach(item -> {
-                if (item != null && !dms.contains(item.getCjdxssdwdm())) {
+                if (item != null && !dms.contains(item.getCjdxssdwdm()) && item.getCjdxssdwdm() != null && !item.getCjdxssdwdm().isEmpty()) {
                     SupExternalDepart supExternalDepart = new SupExternalDepart();
-                    supExternalDepart.setExternalId(item.getCjdxssdwdm() == null ? "" : item.getCjdxssdwdm());
+                    supExternalDepart.setExternalId(item.getCjdxssdwdm());
                     supExternalDepart.setExternalName(item.getCjdxssdwmc() == null ? "" : item.getCjdxssdwmc());
                     dms.add(item.getCjdxssdwdm());
                     supExternalDepart.setSource("情指行");
@@ -90,14 +91,16 @@ public class SupExternalDepartService extends ServiceImpl<SupExternalDepartMappe
             queryWrapper.select("DISTINCT PADWBMdm, PADWBMmc");
         } else if (type == 3) {
             queryWrapper.select("DISTINCT BADWIDdm, BADWIDmc");
+        } else {
+            return;
         }
         List<GBaseAJJBXX> supExternalDeparts = gBaseAJJBXXMapper.selectList(queryWrapper);
         if (!supExternalDeparts.isEmpty()) {
             supExternalDeparts.forEach(item -> {
-                if (item != null) {
+                if (item != null && item.getLADWBMdm() != null && !item.getLADWBMdm().isEmpty()) {
                     SupExternalDepart supExternalDepart = new SupExternalDepart();
                     if (type == 1) {
-                        supExternalDepart.setExternalId(item.getLADWBMdm() == null ? "" : item.getLADWBMdm());
+                        supExternalDepart.setExternalId(item.getLADWBMdm());
                         supExternalDepart.setExternalName(item.getLADWBMmc() == null ? "" : item.getLADWBMmc());
                     } else if (type == 2 && !dms.contains(item.getPADWBMdm())) {
                         supExternalDepart.setExternalId(item.getPADWBMdm() == null ? "" : item.getPADWBMdm());