|
@@ -1,13 +1,14 @@
|
|
package power
|
|
package power
|
|
|
|
|
|
import (
|
|
import (
|
|
- "bp.jydev.jianyu360.cn/BaseService/userCenter/rpc/pb"
|
|
|
|
"database/sql"
|
|
"database/sql"
|
|
"entbase/src/config"
|
|
"entbase/src/config"
|
|
"entbase/src/service_external/util"
|
|
"entbase/src/service_external/util"
|
|
"fmt"
|
|
"fmt"
|
|
"log"
|
|
"log"
|
|
|
|
|
|
|
|
+ "bp.jydev.jianyu360.cn/BaseService/userCenter/rpc/pb"
|
|
|
|
+
|
|
"app.yhyue.com/moapp/jypkg/common/src/qfw/util/jy"
|
|
"app.yhyue.com/moapp/jypkg/common/src/qfw/util/jy"
|
|
|
|
|
|
"app.yhyue.com/moapp/jybase/mongodb"
|
|
"app.yhyue.com/moapp/jybase/mongodb"
|
|
@@ -166,16 +167,16 @@ func (a *Action) PcPersons() {
|
|
departmentSort := a.GetString("departmentSort")
|
|
departmentSort := a.GetString("departmentSort")
|
|
nameSort := a.GetString("nameSort")
|
|
nameSort := a.GetString("nameSort")
|
|
if departmentSort == "" && nameSort == "" {
|
|
if departmentSort == "" && nameSort == "" {
|
|
- sortString = "order by convert(e.name using gbk) COLLATE gbk_chinese_ci desc"
|
|
|
|
|
|
+ sortString = "order by convert(e.name using gbk) COLLATE gbk_chinese_ci desc,c.id desc"
|
|
} else {
|
|
} else {
|
|
if nameSort == "true" {
|
|
if nameSort == "true" {
|
|
- sortString = "order by convert(c.name using gbk) COLLATE gbk_chinese_ci asc"
|
|
|
|
|
|
+ sortString = "order by convert(c.name using gbk) COLLATE gbk_chinese_ci asc,c.id desc"
|
|
} else if nameSort == "false" {
|
|
} else if nameSort == "false" {
|
|
- sortString = "order by convert(c.name using gbk) COLLATE gbk_chinese_ci desc"
|
|
|
|
|
|
+ sortString = "order by convert(c.name using gbk) COLLATE gbk_chinese_ci desc,c.id desc"
|
|
} else if departmentSort == "true" {
|
|
} else if departmentSort == "true" {
|
|
- sortString = "order by convert(a.name using gbk) COLLATE gbk_chinese_ci asc"
|
|
|
|
|
|
+ sortString = "order by convert(a.name using gbk) COLLATE gbk_chinese_ci asc,c.id desc"
|
|
} else if departmentSort == "false" {
|
|
} else if departmentSort == "false" {
|
|
- sortString = "order by convert(a.name using gbk) COLLATE gbk_chinese_ci desc"
|
|
|
|
|
|
+ sortString = "order by convert(a.name using gbk) COLLATE gbk_chinese_ci desc,c.id desc"
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|