变更修改排序

app/service/change_apply.js

@@ -150,7 +150,8 @@ module.exports = app => {
             }
             if (sortBy && orderBy) {
                 if (sortBy === 'code') {
-                    sql += ' ORDER BY CHAR_LENGTH(a.code) ' + orderBy + ',convert(a.code using gbk) ' + orderBy;
+                    // sql += ' ORDER BY CHAR_LENGTH(a.code) ' + orderBy + ',convert(a.code using gbk) ' + orderBy;
+                    sql += ' ORDER BY convert(a.code using gbk) ' + orderBy;
                 } else {
                     sql += ' ORDER BY a.in_time ' + orderBy;
                 }

app/service/change_project.js

@@ -155,7 +155,8 @@ module.exports = app => {
             }
             if (sortBy && orderBy) {
                 if (sortBy === 'code') {
-                    sql += ' ORDER BY CHAR_LENGTH(a.code) ' + orderBy + ',convert(a.code using gbk) ' + orderBy;
+                    // sql += ' ORDER BY CHAR_LENGTH(a.code) ' + orderBy + ',convert(a.code using gbk) ' + orderBy;
+                    sql += ' ORDER BY convert(a.code using gbk) ' + orderBy;
                 } else {
                     sql += ' ORDER BY a.in_time ' + orderBy;
                 }
@@ -168,6 +169,7 @@ module.exports = app => {
                 const limitString = offset >= 0 ? offset + ',' + limit : limit;
                 sql += ' LIMIT ' + limitString;
             }
+            console.log(sql, sqlParam);
             const list = await this.db.query(sql, sqlParam);
             return list;
         }