zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysWorktimeServiceImpl.java
@@ -97,6 +97,7 @@ @Override public boolean isInWorkTime(Long shopId, Date beginTime, Date endTime) { if(beginTime==null){ Date minTime = findMinTime(shopId); Date maxTime = findMaxTime(shopId); minTime.setYear(beginTime.getYear()); @@ -108,5 +109,8 @@ return ( (DateUtil.isDuringDate(minTime, maxTime, beginTime) || minTime.getTime()==beginTime.getTime() ) && DateUtil.isDuringDate(minTime, maxTime, endTime) || maxTime.getTime()==endTime.getTime() ); }else{ return false; } } }