From 0ad1516d29d13796ae2355d83b04cbc9a23cbc7d Mon Sep 17 00:00:00 2001
From: xuxiuxi <554325746@qq.com>
Date: 星期五, 15 三月 2019 09:49:32 +0800
Subject: [PATCH] Merge branch 'yw.1.2.fixbug' of http://192.168.1.226:10010/r/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