Merge branch 'dev' of http://192.168.1.41:3000/maixinrong/Calculation into dev

app/service/change_apply.js

@@ -150,8 +150,7 @@ 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 convert(a.code using gbk) ' + orderBy;
+                    sql += ' ORDER BY CHAR_LENGTH(a.code) ' + orderBy + ',convert(a.code using gbk) ' + orderBy;
                 } else {
                     sql += ' ORDER BY a.in_time ' + orderBy;
                 }

app/service/change_project.js

@@ -155,8 +155,7 @@ 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 convert(a.code using gbk) ' + orderBy;
+                    sql += ' ORDER BY CHAR_LENGTH(a.code) ' + orderBy + ',convert(a.code using gbk) ' + orderBy;
                 } else {
                     sql += ' ORDER BY a.in_time ' + orderBy;
                 }