fix: dept del flag add to agent

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmDaAgentController.java

@@ -987,7 +987,6 @@ public class WmDaAgentController {
     }
 
     /**
-     * // todo
      * 获取cso列表 (接包对象)
      *
      * @return cso列表 二期  业务平台

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/manager/SysImplementPlanManager.java

@@ -149,7 +149,7 @@ public class SysImplementPlanManager {
         Set<Integer> consigneeIds = records.stream().mapToInt(SysImplementPlan::getConsigneeId).boxed().collect(Collectors.toSet());
 
         // 获取承接人
-        Map<Integer, SysDept> consigneeMap = deptService.mapConsignee(consigneeIds);
+        Map<Integer, SysDept> consigneeMap = deptService.mapConsignee(consigneeIds, true);
 
         // 获取商品信息
 
@@ -440,7 +440,7 @@ public class SysImplementPlanManager {
         // 获取承接人ID
         Set<Integer> consigneeIds = plans.stream().mapToInt(SysImplementPlan::getConsigneeId).boxed().collect(Collectors.toSet());
         // 获取承接人
-        Map<Integer, SysDept> consigneeMap = deptService.mapConsignee(consigneeIds);
+        Map<Integer, SysDept> consigneeMap = deptService.mapConsignee(consigneeIds, true);
         // 获取商品信息
         Set<Integer> skuIds = plans.stream().map(SysImplementPlan::getSkuId).collect(Collectors.toSet());
         List<Map<String, String>> skuList = drugEntDrugtableService.listDrugs(skuIds);
@@ -501,7 +501,7 @@ public class SysImplementPlanManager {
 
         // 设置承接人信息
         // 获取承接人
-        Map<Integer, SysDept> consigneeMap = deptService.mapConsignee(new HashSet<>(Collections.singletonList(p.getConsigneeId())));
+        Map<Integer, SysDept> consigneeMap = deptService.mapConsignee(new HashSet<>(Collections.singletonList(p.getConsigneeId())), true);
         Map<String, Object> consigneeInfo = new HashMap<>(2);
         consigneeInfo.put("consigneeId", p.getConsigneeId());
         SysDept sysDept = consigneeMap.get(p.getConsigneeId());

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/SysDeptService.java

@@ -113,5 +113,5 @@ public interface SysDeptService extends IService<SysDept> {
     List<Tree<Long>> getDeptAreaTree(Long deptId);
 
 
-    Map<Integer, SysDept> mapConsignee(Set<Integer> consigneeIds);
+    Map<Integer, SysDept> mapConsignee(Set<Integer> consigneeIds, boolean ignoreDel);
 }

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/SysDeptServiceImpl.java

@@ -561,9 +561,15 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
     }
 
     @Override
-    public Map<Integer, SysDept> mapConsignee(Set<Integer> consigneeIds) {
+    public Map<Integer, SysDept> mapConsignee(Set<Integer> consigneeIds,  boolean ignoreDel) {
 
-        List<SysDept> list = this.list(Wrappers.<SysDept>lambdaQuery().in(SysDept::getDeptId, consigneeIds));
+        LambdaQueryWrapper<SysDept> wrapper = Wrappers.<SysDept>lambdaQuery().in(SysDept::getDeptId, consigneeIds);
+
+        if (ignoreDel) {
+            wrapper.and(i -> i.eq(SysDept::getDelFlag, DelEnum.NOT_DEL.getVal()).or().eq(SysDept::getDelFlag, DelEnum.DELETED.getVal()));
+        }
+
+        List<SysDept> list = this.list(wrapper);
 
         return list.stream().collect(Collectors.toMap(SysDept::getDeptId, Function.identity()));
     }