Merge branch 'yw.1.2.fixbug' of http://192.168.1.226:10010/r/development/c+...

xuxiuxi

2019-03-08 b64e83af6e9e5b56e2af97560c5535816b8b94bd

 QiaoJiaSystem/DataManagerServer/vss/controller/VssChannelTblController.h

@@ -473,7 +473,7 @@
            }

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

            responseJsonValue["success"] = "true";

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

            responseJsonValue["data"] = VssChannelTblDao::instance()->findJsonArray(string("select * from ") + VSSChannelTbl_TABLE_NAME + " where 1 = 1 limit 1", vssChannelTblBuilder.buildVssChannelTblMap());

        }

        return responseJsonValue.toStyledString();

    }

@@ -604,7 +604,9 @@
            }

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

            responseJsonValue["success"] = "true";

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

            responseJsonValue["data"] = VssChannelTblDao::instance()->findJsonArray(string("select * from ") +

                                                                                    VSSChannelTbl_TABLE_NAME + " where 1 = 1"

                                                                                    , vssChannelTblBuilder.buildVssChannelTblMap());



        }

        return responseJsonValue.toStyledString();