Merge branch 'cygx_10.5.1' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

models/user_label.go

@@ -50,7 +50,7 @@ func AddCygxUserLabel(item *CygxUserLabel) (lastId int64, err error) {
 // 修改是否关注
 func UpdateCygxUserLabelIsFollow(isFollow, sourceId, source int, label string) (err error) {
 	o := orm.NewOrm()
-	sql := `UPDATE cygx_user_label SET is_follow=?,label = ?  modify_time=NOW()  WHERE source_id=? AND source = ? `
+	sql := `UPDATE cygx_user_label SET is_follow=?,label = ? , modify_time=NOW()  WHERE source_id=? AND source = ? `
 	_, err = o.Raw(sql, isFollow, label, sourceId, source).Exec()
 	return
 }

services/user_label.go

@@ -70,7 +70,7 @@ func IndustryFllowUserLabelLogReduce(log models.CygxUserLabelLogRedis) (err erro
 	} else {
 		var condition string
 		var pars []interface{}
-		condition += ` WHERE source_id=? AND source = ?  `
+		condition += ` AND source_id=? AND source = ?  `
 		pars = append(pars, industrialManagementId, source)
 		total, e := models.GetCygxUserLabelCount(condition, pars)
 		if e != nil {