diff --git a/src/main/java/com/dsic/gj_erp/controller/jhgk/DmSygdMxController.java b/src/main/java/com/dsic/gj_erp/controller/jhgk/DmSygdMxController.java index a0d67e4..0544c65 100644 --- a/src/main/java/com/dsic/gj_erp/controller/jhgk/DmSygdMxController.java +++ b/src/main/java/com/dsic/gj_erp/controller/jhgk/DmSygdMxController.java @@ -92,6 +92,9 @@ public class DmSygdMxController { Map map=new HashMap<>(); //// 1.根据上料时间 从近到远排序 List list=service.list(new QueryWrapper().between("jssj",mapObj.get("beginTime"),mapObj.get("endTime"))); + if(list.size()==0){ + return new ResultBean(); + } list = list.stream() .filter(mx -> Objects.nonNull(mx.getJssj())) .sorted(Comparator.comparing(DmSygdMx::getJssj, Comparator.nullsLast(Comparator.naturalOrder()))).collect(Collectors.toList());