|
@@ -55,6 +55,7 @@ import java.util.ArrayList;
|
|
|
import java.util.Arrays;
|
|
|
import java.util.Collections;
|
|
|
import java.util.HashMap;
|
|
|
+import java.util.HashSet;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
|
import java.util.Objects;
|
|
@@ -463,8 +464,15 @@ public class WmPackageManager {
|
|
|
// 获取需要导出的积分包信息
|
|
|
public List<WmScorePackageInfoExcelModel> exportPkgInfo(LocalDate startDate, LocalDate endDate) {
|
|
|
|
|
|
+ Set<Integer> ignoreIds = new HashSet<>();
|
|
|
+ ignoreIds.add(1716964676);
|
|
|
+ ignoreIds.add(-1020826);
|
|
|
+ ignoreIds.add(-1019986);
|
|
|
+
|
|
|
// 获取所有的企业
|
|
|
- List<SysDept> depts = deptService.list(Wrappers.<SysDept>lambdaQuery().eq(SysDept::getDelFlag, CommonConstants.STATUS_NORMAL));
|
|
|
+ List<SysDept> depts = deptService.list(Wrappers.<SysDept>lambdaQuery().eq(SysDept::getDelFlag, CommonConstants.STATUS_NORMAL)).stream().filter(d -> !ignoreIds.contains(d.getDeptId())).collect(Collectors.toList());
|
|
|
+
|
|
|
+
|
|
|
|
|
|
if (CollUtil.isEmpty(depts)) {
|
|
|
throw new BizException("不存在生效的企业信息,无法获取导出数据");
|