From 4cab5d1219c7ea01e60a0629bf0e9e062be029d1 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 21 Apr 2021 16:00:27 +0800
Subject: [PATCH] Merge branch 'score_shop' into api_score_meger
---
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysWorktimeServiceImpl.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysWorktimeServiceImpl.java b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysWorktimeServiceImpl.java
index d97fbba..77ccadb 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysWorktimeServiceImpl.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysWorktimeServiceImpl.java
@@ -97,7 +97,7 @@
@Override
public boolean isInWorkTime(Long shopId, Date beginTime, Date endTime) {
- if(beginTime==null){
+ if(beginTime!=null){
Date minTime = findMinTime(shopId);
Date maxTime = findMaxTime(shopId);
minTime.setYear(beginTime.getYear());
--
Gitblit v1.9.1