Commit d24012f2 by 宋毅

tj

parent 9029cfe9
......@@ -552,7 +552,7 @@ class OrderTmProductService extends ServiceBase {
" c.`customerType`,c.`businessLicensePic`,c.`identityCardPic`,tm.`gzwtsUrl`,tm.`smwjUrl`" +
" FROM `b_order_tm_product` AS tm LEFT JOIN `b_order` AS o ON tm.`sourceOrderNo`=o.`orderNo` LEFT JOIN" +
" `b_customerinfo` AS c ON tm.`deliveryOrderNo`=c.`deliveryOrderNo` where tm.deleted_at is null ";
var sqlCount = "SELECT count(1) FROM `b_order_tm_product` AS tm LEFT JOIN `b_order` AS o ON tm.`sourceOrderNo`=o.`orderNo` LEFT JOIN" +
var sqlCount = "SELECT count(1) as dataCount FROM `b_order_tm_product` AS tm LEFT JOIN `b_order` AS o ON tm.`sourceOrderNo`=o.`orderNo` LEFT JOIN" +
" `b_customerinfo` AS c ON tm.`deliveryOrderNo`=c.`deliveryOrderNo` where tm.deleted_at is null ";
var paramWhere = {};
if (req.user) {
......@@ -611,7 +611,7 @@ class OrderTmProductService extends ServiceBase {
return system.getResultSuccess(null, "暂无数据");
}
var result = system.getResultSuccess(tmpResult);
result.dataCount = tmpResultCount || 0;
result.dataCount = tmpResultCount && tmpResultCount.dataCount ? tmpResultCount.dataCount : 0;
return 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