From d3a71dc6fb436014ca98f86c34fe214c5747552a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Thu, 17 Dec 2020 10:07:39 +0800
Subject: [PATCH] a

---
 business/model/dao/dao_job.go | 23 +++++++----------------
 1 file changed, 7 insertions(+), 16 deletions(-)

diff --git a/business/model/dao/dao_job.go b/business/model/dao/dao_job.go
index 69780a25b..31f7bfb83 100644
--- a/business/model/dao/dao_job.go
+++ b/business/model/dao/dao_job.go
@@ -63,25 +63,16 @@ func GetJobImgs(db *DaoDB, jobID int) (jobImgs []*model.JobImg, err error) {
 
 func GetJobs(db *DaoDB, userIDs []string, categoryIDs, statuss, vendorIDs, types []int, includeStep bool, fromTime, toTime time.Time, lng, lat float64, keyword string, sortType, pageSize, offset int) (pagedInfo *model.PagedInfo, err error) {
 	var (
-		jobs         []*GetJobsResult
-		distanceFlag bool
-		sqlParams    = []interface{}{}
+		jobs      []*GetJobsResult
+		sqlParams = []interface{}{}
 	)
-	if lng != 0 && lat != 0 && (sortType == sortTypeDistance || sortType == -sortTypeDistance) {
-		distanceFlag = true
-	}
 	sql := `
-		SELECT SQL_CALC_FOUND_ROWS a.*, b.name 
-		`
-	if distanceFlag {
-		sql += `, getDistance(?, ?, a.lng, a.lat) distance`
-		sqlParams = append(sqlParams, lng, lat)
-	}
-	sql += ` FROM job a 
-		  JOIN job_category b ON b.id = a.job_category_id AND b.deleted_at = ? 
-		 WHERE a.deleted_at = ?
+		SELECT SQL_CALC_FOUND_ROWS a.*, b.name, getDistance(?, ?, a.lng, a.lat) distance
+		FROM job a 
+		JOIN job_category b ON b.id = a.job_category_id AND b.deleted_at = ? 
+		WHERE a.deleted_at = ?
 	`
-	sqlParams = append(sqlParams, utils.DefaultTimeValue, utils.DefaultTimeValue)
+	sqlParams = append(sqlParams, lng, lat, utils.DefaultTimeValue, utils.DefaultTimeValue)
 	if len(userIDs) > 0 {
 		sql += ` AND a.user_id IN (` + GenQuestionMarks(len(userIDs)) + `)`
 		sqlParams = append(sqlParams, userIDs)