|
@@ -89,7 +89,7 @@ module.exports = app => {
|
|
|
' FROM ?? As t ' +
|
|
|
' Left Join ?? As pa ' +
|
|
|
' ON t.`user_id` = pa.`id` ' +
|
|
|
- ' WHERE t.`project_id` = ? AND t.`user_id` = ?';
|
|
|
+ ' WHERE t.`project_id` = ? AND t.`user_id` = ? ORDER BY CONVERT(t.`name` USING GBK) ASC';
|
|
|
sqlParam = [this.tableName, this.ctx.service.projectAccount.tableName, session.sessionProject.id, session.sessionUser.accountId];
|
|
|
} else if (permission !== null && permission.tender !== undefined && permission.tender.indexOf('2') !== -1) {
|
|
|
// 具有查看所有标段权限的用户查阅标段
|
|
@@ -98,7 +98,7 @@ module.exports = app => {
|
|
|
' FROM ?? As t ' +
|
|
|
' Left Join ?? As pa ' +
|
|
|
' ON t.`user_id` = pa.`id` ' +
|
|
|
- ' WHERE t.`project_id` = ?';
|
|
|
+ ' WHERE t.`project_id` = ? ORDER BY CONVERT(t.`name` USING GBK) ASC';
|
|
|
sqlParam = [this.tableName, this.ctx.service.projectAccount.tableName, session.sessionProject.id];
|
|
|
} else {
|
|
|
// 根据用户权限查阅标段
|
|
@@ -127,7 +127,7 @@ module.exports = app => {
|
|
|
' OR (t.`ledger_status` = ' + auditConst.ledger.status.checked + ' AND ' +
|
|
|
' t.id IN ( SELECT ra.`tender_id` FROM ?? AS ra WHERE ra.`audit_id` = ? GROUP BY ra.`tender_id`))' +
|
|
|
// 未参与,但可见的标段
|
|
|
- ')';
|
|
|
+ ') ORDER BY CONVERT(t.`name` USING GBK) ASC';
|
|
|
sqlParam = [this.tableName, this.ctx.service.projectAccount.tableName, session.sessionProject.id, session.sessionUser.accountId,
|
|
|
this.ctx.service.ledgerAudit.tableName, session.sessionUser.accountId,
|
|
|
this.ctx.service.stageAudit.tableName, session.sessionUser.accountId,
|