From bdda3d8531513e32e0a079def5a3e342907a2ef7 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Fri, 18 Jun 2021 22:09:52 +0800
Subject: [PATCH] 修复每日业绩bug和优化赠送业绩计算方式

---
 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