zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysWorktimeServiceImpl.java
@@ -99,6 +99,7 @@ public boolean isInWorkTime(Long shopId, Date beginTime, Date endTime) { if(beginTime!=null){ Date minTime = findMinTime(shopId); if(minTime!=null){ Date maxTime = findMaxTime(shopId); minTime.setYear(beginTime.getYear()); minTime.setMonth(beginTime.getMonth()); @@ -112,5 +113,9 @@ }else{ return false; } }else{ return false; } } }