diff --git a/business/model/dao/dao_user.go b/business/model/dao/dao_user.go index 9295769f1..2d46378f5 100644 --- a/business/model/dao/dao_user.go +++ b/business/model/dao/dao_user.go @@ -74,17 +74,15 @@ func GetUsers(db *DaoDB, userType int, keyword string, userIDs, userID2s, mobile sql += " WHERE user_id IN (" + GenQuestionMarks(len(userIDs)) + ")" sqlParams = append(sqlParams, userIDs) } - sql += ` GROUP BY 1)t2 + sql += ` GROUP BY 1)t2 ON t2.user_id = t1.user_id LEFT JOIN (SELECT user_id, COUNT(user_id) finished_order_count FROM job_order WHERE 1 = 1 ` if len(userIDs) > 0 { sql += " AND user_id IN (" + GenQuestionMarks(len(userIDs)) + ")" sqlParams = append(sqlParams, userIDs) } - sql += ` AND status = ? GROUP BY 1)t3 - WHERE t1.status = 1 AND t1.deleted_at = ? AND t1.type & ? <> 0 - AND t1.user_id = t2.user_id - AND t1.user_id = t3.user_id` - sqlParams = append(sqlParams, model.JobOrderStatusFinish, utils.DefaultTimeValue, userType) + sql += ` AND status = ? GROUP BY 1)t3 ON t3.user_id = t1.user_id + WHERE t1.status = 1 AND t1.deleted_at = ?` + sqlParams = append(sqlParams, model.JobOrderStatusFinish, utils.DefaultTimeValue) if len(userIDs) > 0 { sql += " AND t1.user_id IN (" + GenQuestionMarks(len(userIDs)) + ")" sqlParams = append(sqlParams, userIDs) @@ -104,8 +102,6 @@ func GetUsers(db *DaoDB, userType int, keyword string, userIDs, userID2s, mobile } sql += " LIMIT ? OFFSET ?" sqlParams = append(sqlParams, pageSize, offset) - fmt.Println(sql) - fmt.Println(sqlParams) Begin(db) defer Commit(db) if err = GetRows(db, &userList, sql, sqlParams...); err == nil {