From 5fa7c97d9544e7afdf781a93e8ffb58dce22c977 Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期五, 08 三月 2019 14:10:35 +0800
Subject: [PATCH] Merge branch 'yw.1.2.fixbug' of ssh://192.168.1.226:29418/development/c++ into yw.1.2
---
QiaoJiaSystem/DataManagerServer/vss/dao/BaseDao.h | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/QiaoJiaSystem/DataManagerServer/vss/dao/BaseDao.h b/QiaoJiaSystem/DataManagerServer/vss/dao/BaseDao.h
index aaf3865..bc1c593 100644
--- a/QiaoJiaSystem/DataManagerServer/vss/dao/BaseDao.h
+++ b/QiaoJiaSystem/DataManagerServer/vss/dao/BaseDao.h
@@ -77,7 +77,8 @@
return rowDataList;
}
- static Json::Value findJsonArray(string sql) {
+ static Json::Value findJsonArray(string sql, std::map<std::string, std::string>& whereColumns) {
+ sql = sql + getWhereColumnNameValuePair(whereColumns);
initConnection();
mysqlpp::Query query = conn->query(sql);
Json::Value rowList;
--
Gitblit v1.8.0