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 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 { List 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 { void enable(@Valid EnableQO request); IPage 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 implements IAdServi public IPage 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 + +