diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/impl/BstIvtPackageinfoivtServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/impl/BstIvtPackageinfoivtServiceImpl.java index d57cc7663..3d2659bb8 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/impl/BstIvtPackageinfoivtServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/impl/BstIvtPackageinfoivtServiceImpl.java @@ -43,6 +43,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; import javax.annotation.Resource; import java.lang.reflect.Method; @@ -113,8 +114,11 @@ public class BstIvtPackageinfoivtServiceImpl extends ServiceImpl(page.getPage() + 1, page.getSize()), queryWrapper); List records = selectPage.getRecords(); Set containers = records.stream().map(BstIvtPackageinfoivt::getContainer_name).filter(a->StringUtils.isNotEmpty(a)).collect(Collectors.toSet()); - List containerInfo = iPdmBiSlittingproductionplanService.list(new QueryWrapper().in("container_name", containers).select("container_name", "weight", "paper_weight")); - Map listMap = containerInfo.stream().collect(HashMap::new,(m, o) -> m.put(o.getContainer_name(),o), HashMap::putAll); + Map listMap = new HashMap(); + if (!CollectionUtils.isEmpty(containers)){ + List containerInfo = iPdmBiSlittingproductionplanService.list(new QueryWrapper().in("container_name", containers).select("container_name", "weight", "paper_weight")); + listMap = containerInfo.stream().collect(HashMap::new,(m, o) -> m.put(o.getContainer_name(),o), HashMap::putAll); + } List voRecords = new ArrayList<>(); for (BstIvtPackageinfoivt record : records) { BstIvtPackageinfoivtVO vo = new BstIvtPackageinfoivtVO(); diff --git a/lms/nladmin-system/src/main/resources/config/application.yml b/lms/nladmin-system/src/main/resources/config/application.yml index 2925d409e..68bbaf335 100644 --- a/lms/nladmin-system/src/main/resources/config/application.yml +++ b/lms/nladmin-system/src/main/resources/config/application.yml @@ -6,7 +6,7 @@ spring: freemarker: check-template-location: false profiles: - active: dev + active: prod jackson: time-zone: GMT+8 data: