Merge branch 'yw.1.2.fixbug' of ssh://192.168.1.226:29418/development/c++ i...

pansen

2019-03-15 c64a4f19a0a41b62917eb1dc8b0789c9ddf6baab

 QiaoJiaSystem/DataManagerServer/vss/controller/VssUpperSvrTblController.h

@@ -368,7 +368,7 @@
            }

            responseJsonValue["message"] = "查询成功！";

            responseJsonValue["success"] = "true";

            responseJsonValue["data"] = VssUpperSvrTblDao::instance()->findJsonArray(string("select * from ") + VSSUpperSvrTbl_TABLE_NAME + " where 1 = 1 limit 1");

            responseJsonValue["data"] = VssUpperSvrTblDao::instance()->findJsonArray(string("select * from ") + VSSUpperSvrTbl_TABLE_NAME + " where 1 = 1 limit 1", vssUpperSvrTblBuilder.buildVssUpperSvrTblMap());

        }

        return responseJsonValue.toStyledString();

    }

@@ -464,7 +464,7 @@
            }

            responseJsonValue["message"] = "查询成功！";

            responseJsonValue["success"] = "true";

            responseJsonValue["data"] = VssUpperSvrTblDao::instance()->findJsonArray(string("select * from ") + VSSUpperSvrTbl_TABLE_NAME + " where 1 = 1");

            responseJsonValue["data"] = VssUpperSvrTblDao::instance()->findJsonArray(string("select * from ") + VSSUpperSvrTbl_TABLE_NAME + " where 1 = 1", vssUpperSvrTblBuilder.buildVssUpperSvrTblMap());



        }

        return responseJsonValue.toStyledString();