From 07fb2c16c75734d8c127585353249f529ea1262c Mon Sep 17 00:00:00 2001
From: pans <pansen626@sina.com>
Date: 星期四, 14 三月 2019 17:39:25 +0800
Subject: [PATCH] Merge branch 'yw.1.2.fixbug' of ssh://192.168.1.226:29418/development/c++ into yw.1.2.fixbug
---
QiaoJiaSystem/FaceSearchServer/FaceDBCompareServer.h | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/QiaoJiaSystem/FaceSearchServer/FaceDBCompareServer.h b/QiaoJiaSystem/FaceSearchServer/FaceDBCompareServer.h
index 7940970..da4bb96 100644
--- a/QiaoJiaSystem/FaceSearchServer/FaceDBCompareServer.h
+++ b/QiaoJiaSystem/FaceSearchServer/FaceDBCompareServer.h
@@ -54,11 +54,10 @@
static bool getRet(std::string startTime, std::string endTime) {
auto crrentTime = AppUtil::getTimeSecString();
- if (crrentTime.compare(startTime) > 0 && crrentTime.compare(endTime) < 0) {
+ if (crrentTime.compare(startTime) > 0 && (crrentTime.compare(endTime) < 0 || endTime == "0000-00-00 00:00:00")) {
return true;
}
return false;
-
}
#endif //COMPARETEST_FACEDBCOMPARESERVER_H
--
Gitblit v1.8.0