diff --git a/casic-check/src/main/java/com/casic/missiles/modular/check/controller/CheckMenuController.java b/casic-check/src/main/java/com/casic/missiles/modular/check/controller/CheckMenuController.java index aa3440b..8c4a22f 100644 --- a/casic-check/src/main/java/com/casic/missiles/modular/check/controller/CheckMenuController.java +++ b/casic-check/src/main/java/com/casic/missiles/modular/check/controller/CheckMenuController.java @@ -173,16 +173,16 @@ */ @RequestMapping(value = "/detailList") @ResponseBody - public Object detailList(String startTime,String endTime) { - if(ToolUtil.isNotEmpty(startTime)){ - if(DateUtil.compareDate(DateUtil.getDay(),startTime)){ + public Object detailList(String startTime, String endTime) { + if (ToolUtil.isNotEmpty(startTime) && ToolUtil.isNotEmpty(endTime)) { + if (DateUtil.compareDate(DateUtil.getDay(), startTime) && DateUtil.compareDate(endTime, DateUtil.getDay())) { return detail(1L); } - } - if(ToolUtil.isNotEmpty(endTime)){ - if(DateUtil.compareDate(endTime,DateUtil.getDay())){ - return detail(1L); - } + } else if (ToolUtil.isNotEmpty(endTime) && DateUtil.compareDate(endTime, DateUtil.getDay())) { + return detail(1L); + + } else if (ToolUtil.isNotEmpty(startTime) && DateUtil.compareDate(DateUtil.getDay(), startTime)) { + return detail(1L); } Map resultMap = new HashMap<>();