From 28b89b157b98e38f9b745722a49475ab87c427fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor2010@gmail.com>
Date: Tue, 1 Jul 2025 17:18:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/nflg/wms/admin/service/LDAPControllerService.java  | 4 ++--
 .../java/com/nflg/wms/common/pojo/qo/LDAPUpdateQO.java     | 4 ++++
 .../main/java/com/nflg/wms/repository/mapper/AdMapper.java | 2 ++
 .../java/com/nflg/wms/repository/service/IAdService.java   | 2 ++
 .../nflg/wms/repository/service/impl/AdServiceImpl.java    | 5 +++++
 nflg-wms-repository/src/main/resources/mapper/AdMapper.xml | 7 +++++++
 6 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/LDAPControllerService.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/LDAPControllerService.java
index 0e0e457c..7451f9fe 100644
--- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/LDAPControllerService.java
+++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/LDAPControllerService.java
@@ -64,9 +64,9 @@ public class LDAPControllerService {
     }
 
     public void sync(@Valid @NotNull Long id) {
-        Ad ad = adService.getById(id);
+        AdDTO ad = adService.getInfo(id);
         VUtil.trueThrowBusinessError(Objects.isNull(ad)).throwMessage("数据不存在");
-        departmentControllerService.syncFromLdap(Convert.convert(AdDTO.class, ad));
+        departmentControllerService.syncFromLdap(ad);
     }
 
     public IPage<Ad> search(@Valid PageQO request) {
diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/LDAPUpdateQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/LDAPUpdateQO.java
index 8c07a9fb..91ab16d8 100644
--- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/LDAPUpdateQO.java
+++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/LDAPUpdateQO.java
@@ -1,9 +1,13 @@
 package com.nflg.wms.common.pojo.qo;
 
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 import lombok.NonNull;
 
 @Data
+@AllArgsConstructor
+@NoArgsConstructor
 public class LDAPUpdateQO extends LDAPAddQO{
 
     @NonNull
diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/AdMapper.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/AdMapper.java
index 63728e44..7c7f9fbb 100644
--- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/AdMapper.java
+++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/AdMapper.java
@@ -17,4 +17,6 @@ import java.util.List;
 public interface AdMapper extends BaseMapper<Ad> {
 
     List<AdDTO> getList();
+
+    AdDTO getInfo(Long id);
 }
diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IAdService.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IAdService.java
index acf09053..458eb64f 100644
--- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IAdService.java
+++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IAdService.java
@@ -32,4 +32,6 @@ public interface IAdService extends IService<Ad> {
     void enable(@Valid EnableQO request);
 
     IPage<Ad> search(@Valid PageQO request);
+
+    AdDTO getInfo(@Valid @NotNull Long id);
 }
diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/AdServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/AdServiceImpl.java
index 3cffd5c2..f3d726db 100644
--- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/AdServiceImpl.java
+++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/AdServiceImpl.java
@@ -81,4 +81,9 @@ public class AdServiceImpl extends ServiceImpl<AdMapper, Ad> implements IAdServi
     public IPage<Ad> search(PageQO request) {
         return lambdaQuery().page(new Page<>(request.getPage(), request.getPageSize()));
     }
+
+    @Override
+    public AdDTO getInfo(Long id) {
+        return baseMapper.getInfo(id);
+    }
 }
diff --git a/nflg-wms-repository/src/main/resources/mapper/AdMapper.xml b/nflg-wms-repository/src/main/resources/mapper/AdMapper.xml
index 69df136a..2c5911bc 100644
--- a/nflg-wms-repository/src/main/resources/mapper/AdMapper.xml
+++ b/nflg-wms-repository/src/main/resources/mapper/AdMapper.xml
@@ -8,4 +8,11 @@
         inner join ad_sync ac on a.id = ac.ad_id
         where a.enable
     </select>
+
+    <select id="getInfo" resultType="com.nflg.wms.common.pojo.dto.AdDTO">
+        select a.*,ac.map_from,ac.map_to,ac.next_sync_date,ac.enable as enableSync,ac.id as syncId,ac.type
+        from ad a
+                 inner join ad_sync ac on a.id = ac.ad_id
+        where a.enable and a.id = #{id}
+    </select>
 </mapper>