|
|
@@ -196,8 +196,10 @@ func Findcandidate(DkPersonMap []map[string]interface{}, entId int64, orderType
|
|
|
personMap := map[string]map[string]interface{}{}
|
|
|
positionId := int64(0)
|
|
|
phoneArr := []string{}
|
|
|
+ personNameArr := []string{}
|
|
|
for _, v := range DkPersonMap {
|
|
|
phoneArr = append(phoneArr, fmt.Sprintf(`"%s"`, gconv.String(v["phone"])))
|
|
|
+ personNameArr = append(personNameArr, fmt.Sprintf(`"%s"`, gconv.String(v["personName"])))
|
|
|
personMap[gconv.String(v["phone"])] = map[string]interface{}{
|
|
|
"name": gconv.String(v["personName"]),
|
|
|
}
|
|
|
@@ -248,7 +250,7 @@ FROM
|
|
|
FIND_IN_SET(current_position_id , ?) and two_type=?
|
|
|
GROUP BY current_position_id
|
|
|
ORDER BY
|
|
|
- count`, strings.Join(positionArr, ","), orderType)
|
|
|
+ count ,FIELD(current_name,?) asc `, strings.Join(positionArr, ","), orderType, strings.Join(personNameArr, ","))
|
|
|
if positionNumberMap != nil && len(*positionNumberMap) == len(DkPersonMap) {
|
|
|
positionId = gconv.Int64((*positionNumberMap)[0]["current_position_id"])
|
|
|
} else if positionNumberMap != nil && len(*positionNumberMap) != len(DkPersonMap) {
|
WH01243