diff --git a/business/jxstore/cms/job.go b/business/jxstore/cms/job.go index 86d158cd3..256eeacfc 100644 --- a/business/jxstore/cms/job.go +++ b/business/jxstore/cms/job.go @@ -219,10 +219,11 @@ func CancelPublishJob(ctx *jxcontext.Context, jobID int) (err error) { func GetJobs(ctx *jxcontext.Context, userIDs []string, categoryIDs, statuss, vendorIDs []int, includeStep bool, fromTime, toTime string, lng, lat float64, span int, keyword string, sortType, pageSize, offset int) (pagedInfo *model.PagedInfo, err error) { var ( - db = dao.GetDB() - userID = ctx.GetUserID() + db = dao.GetDB() + userID = ctx.GetUserID() + _, _, cityCode, _ = getAddressInfoFromCoord(db, lng, lat) ) - pagedInfo, err = dao.GetJobs(db, userIDs, categoryIDs, statuss, vendorIDs, []int{model.JobTypeNormal}, includeStep, utils.Str2Time(fromTime), utils.Str2Time(toTime), lng, lat, span, keyword, sortType, pageSize, offset) + pagedInfo, err = dao.GetJobs(db, userIDs, categoryIDs, statuss, vendorIDs, []int{model.JobTypeNormal}, includeStep, utils.Str2Time(fromTime), utils.Str2Time(toTime), lng, lat, cityCode, span, keyword, sortType, pageSize, offset) //插入用户搜索关键词 if keyword != "" { if userSearchs, _ := dao.GetUserSearch(db, userID, keyword); len(userSearchs) > 0 { diff --git a/business/model/dao/dao_job.go b/business/model/dao/dao_job.go index c5032ae00..518cdaedc 100644 --- a/business/model/dao/dao_job.go +++ b/business/model/dao/dao_job.go @@ -61,7 +61,7 @@ func GetJobImgs(db *DaoDB, jobID int) (jobImgs []*model.JobImg, err error) { return jobImgs, err } -func GetJobs(db *DaoDB, userIDs []string, categoryIDs, statuss, vendorIDs, types []int, includeStep bool, fromTime, toTime time.Time, lng, lat float64, span int, keyword string, sortType, pageSize, offset int) (pagedInfo *model.PagedInfo, err error) { +func GetJobs(db *DaoDB, userIDs []string, categoryIDs, statuss, vendorIDs, types []int, includeStep bool, fromTime, toTime time.Time, lng, lat float64, cityCode, span int, keyword string, sortType, pageSize, offset int) (pagedInfo *model.PagedInfo, err error) { var ( jobs []*GetJobsResult sqlParams = []interface{}{} @@ -71,8 +71,9 @@ func GetJobs(db *DaoDB, userIDs []string, categoryIDs, statuss, vendorIDs, types FROM job a JOIN job_category b ON b.id = a.job_category_id AND b.deleted_at = ? WHERE a.deleted_at = ? + AND (a.job_city_code = ? OR a.job_city_code = ?) ` - sqlParams = append(sqlParams, lng, lat, utils.DefaultTimeValue, utils.DefaultTimeValue) + sqlParams = append(sqlParams, lng, lat, utils.DefaultTimeValue, utils.DefaultTimeValue, cityCode, model.JobCountrywideCode) if len(userIDs) > 0 { sql += ` AND a.user_id IN (` + GenQuestionMarks(len(userIDs)) + `)` sqlParams = append(sqlParams, userIDs)