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/DataManagerServer/http_configserver.cpp | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/QiaoJiaSystem/DataManagerServer/http_configserver.cpp b/QiaoJiaSystem/DataManagerServer/http_configserver.cpp
index 7c46296..5193036 100644
--- a/QiaoJiaSystem/DataManagerServer/http_configserver.cpp
+++ b/QiaoJiaSystem/DataManagerServer/http_configserver.cpp
@@ -1015,7 +1015,9 @@
if (count > 0) {
for (auto rule:ruleMap) {
- elem["nSdkTypes"].append(rule.second.nSdkType);
+ if (rule.second.nIsRun == 1) {
+ elem["nSdkTypes"].append(rule.second.nSdkType);
+ }
}
}
// Record_Cam_Sdk rec_sdk = db_c.searchCamSdkTableByCamId(iter->str_cam_dev_id);
--
Gitblit v1.8.0