Commit 3dfd0b68 by lixinming

修bug

parent 62b04a20
...@@ -4,7 +4,7 @@ import { modelMap } from "../../model/modelBind"; ...@@ -4,7 +4,7 @@ import { modelMap } from "../../model/modelBind";
import { BizError } from "../../util/bizError"; import { BizError } from "../../util/bizError";
function analysisParamToWhere(param, column) { function analysisParamToWhere(param, column) {
let where let where = {};
for (let key in param) {// 模糊查询{"字段名":{"%like%":'三'}} for (let key in param) {// 模糊查询{"字段名":{"%like%":'三'}}
if (param[key]["%like%"]) { if (param[key]["%like%"]) {
where[key] = {[Op.like]:`%${param[key]["%like%"]}%`}; where[key] = {[Op.like]:`%${param[key]["%like%"]}%`};
...@@ -14,8 +14,8 @@ function analysisParamToWhere(param, column) { ...@@ -14,8 +14,8 @@ function analysisParamToWhere(param, column) {
} }
let selectParam:any = {where}; let selectParam:any = {where};
if (column.length) selectParam.attributes = column; if (column && column.length) selectParam.attributes = column;
return selectParam return selectParam;
} }
/** /**
...@@ -26,7 +26,7 @@ function analysisParamToWhere(param, column) { ...@@ -26,7 +26,7 @@ function analysisParamToWhere(param, column) {
*/ */
export async function selectOneDataByParam(tableModel, param, column) { export async function selectOneDataByParam(tableModel, param, column) {
let selectParam = analysisParamToWhere(param, column); let selectParam = analysisParamToWhere(param, column);
let data = tableModel.findOne(selectParam); let data = await tableModel.findOne(selectParam);
return {data}; return {data};
} }
...@@ -39,7 +39,7 @@ export async function selectOneDataByParam(tableModel, param, column) { ...@@ -39,7 +39,7 @@ export async function selectOneDataByParam(tableModel, param, column) {
*/ */
export async function selectDataListByParam(tableModel, param, column) { export async function selectDataListByParam(tableModel, param, column) {
let selectParam = analysisParamToWhere(param, column); let selectParam = analysisParamToWhere(param, column);
let data = tableModel.findAll(selectParam); let data = await tableModel.findAll(selectParam);
return {data}; return {data};
} }
...@@ -56,13 +56,13 @@ export async function selectDataListToPageByParam(tableModel, param, column, pag ...@@ -56,13 +56,13 @@ export async function selectDataListToPageByParam(tableModel, param, column, pag
let selectParam:any = analysisParamToWhere(param, column); let selectParam:any = analysisParamToWhere(param, column);
selectParam.limit = pageSize || 10; selectParam.limit = pageSize || 10;
selectParam.offset = (pageNumber-1)*10; selectParam.offset = (pageNumber-1)*10;
let data = tableModel.findAll(selectParam); let data = await tableModel.findAll(selectParam);
return {data}; return {data};
} }
export async function selectDataCountByParam(tableModel, param) { export async function selectDataCountByParam(tableModel, param) {
let selectParam:any = analysisParamToWhere(param, []); let selectParam:any = analysisParamToWhere(param, []);
let data = tableModel.count(selectParam); let data = await tableModel.count(selectParam);
return {data}; return {data};
} }
...@@ -98,7 +98,7 @@ export async function selectDataToTableAssociation(tableModel, includeConf, para ...@@ -98,7 +98,7 @@ export async function selectDataToTableAssociation(tableModel, includeConf, para
let selectParam:any = analysisParamToWhere(param, column); let selectParam:any = analysisParamToWhere(param, column);
selectParam.include = include; selectParam.include = include;
let data = tableModel.findAll(selectParam); let data = await tableModel.findAll(selectParam);
return {data}; return {data};
} }
...@@ -126,6 +126,6 @@ export async function selectDataToTableAssociationToPage(tableModel, includeConf ...@@ -126,6 +126,6 @@ export async function selectDataToTableAssociationToPage(tableModel, includeConf
selectParam.limit = pageSize || 10; selectParam.limit = pageSize || 10;
selectParam.offset = (pageNumber-1)*10; selectParam.offset = (pageNumber-1)*10;
let data = tableModel.findAll(selectParam); let data = await tableModel.findAll(selectParam);
return {data}; return {data};
} }
\ No newline at end of file
...@@ -64,7 +64,7 @@ async function findOneData(req, res) { ...@@ -64,7 +64,7 @@ async function findOneData(req, res) {
let table = req.tableModel; let table = req.tableModel;
let reqConf = {param:'Object', column:"[String]"}; let reqConf = {param:'Object', column:"[String]"};
let { param, column } = eccReqParamater(reqConf, req.body); let { param, column } = eccReqParamater(reqConf, req.body, ["column"]);
let result = await findBiz.selectOneDataByParam(table, param, column); let result = await findBiz.selectOneDataByParam(table, param, column);
res.success(result); res.success(result);
...@@ -75,7 +75,7 @@ async function findManyData(req, res) { ...@@ -75,7 +75,7 @@ async function findManyData(req, res) {
let table = req.tableModel; let table = req.tableModel;
let reqConf = {param:'Object', column:"[String]"}; let reqConf = {param:'Object', column:"[String]"};
let { param, column } = eccReqParamater(reqConf, req.body); let { param, column } = eccReqParamater(reqConf, req.body, ["column"]);
let result = await findBiz.selectDataListByParam(table, param, column); let result = await findBiz.selectDataListByParam(table, param, column);
res.success(result); res.success(result);
...@@ -86,7 +86,7 @@ async function findManyToPageData(req, res) { ...@@ -86,7 +86,7 @@ async function findManyToPageData(req, res) {
let table = req.tableModel; let table = req.tableModel;
let reqConf = {param:'Object', pageNumber:'Number', pageSize:'Number', column:"[String]"}; let reqConf = {param:'Object', pageNumber:'Number', pageSize:'Number', column:"[String]"};
let { param, pageNumber, pageSize, column } = eccReqParamater(reqConf, req.body ); let { param, pageNumber, pageSize, column } = eccReqParamater(reqConf, req.body, ["column"] );
let result = await findBiz.selectDataListToPageByParam(table, param, column, pageNumber, pageSize); let result = await findBiz.selectDataListToPageByParam(table, param, column, pageNumber, pageSize);
res.success(result); res.success(result);
...@@ -108,7 +108,7 @@ async function findAggragateData(req, res) { ...@@ -108,7 +108,7 @@ async function findAggragateData(req, res) {
let table = req.tableModel; let table = req.tableModel;
let reqConf = {param:'Object', includeConf:'Object', column:"[String]" }; let reqConf = {param:'Object', includeConf:'Object', column:"[String]" };
let { param, includeConf, column } = eccReqParamater(reqConf, req.body); let { param, includeConf, column } = eccReqParamater(reqConf, req.body, ["column"]);
let result = await findBiz.selectDataToTableAssociation(table, includeConf, param, column); let result = await findBiz.selectDataToTableAssociation(table, includeConf, param, column);
res.success(result); res.success(result);
...@@ -119,7 +119,7 @@ async function findAggragateDataToPage(req, res) { ...@@ -119,7 +119,7 @@ async function findAggragateDataToPage(req, res) {
let table = req.tableModel; let table = req.tableModel;
let reqConf = {param:'Object', includeConf:'Object', column:"[String]", pageNumber:'Number', pageSize:'Number', }; let reqConf = {param:'Object', includeConf:'Object', column:"[String]", pageNumber:'Number', pageSize:'Number', };
let { param, includeConf, column, pageNumber, pageSize } = eccReqParamater(reqConf, req.body); let { param, includeConf, column, pageNumber, pageSize } = eccReqParamater(reqConf, req.body, ["column"]);
let result = await findBiz.selectDataToTableAssociationToPage(table, includeConf, param, column, pageNumber, pageSize); let result = await findBiz.selectDataToTableAssociationToPage(table, includeConf, param, column, pageNumber, pageSize);
res.success(result); res.success(result);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment