xingzai 2 years ago
parent
commit
63585b3ede
3 changed files with 5 additions and 5 deletions
  1. 1 1
      controllers/activity.go
  2. 1 1
      controllers/report.go
  3. 3 3
      models/industrial_management.go

+ 1 - 1
controllers/activity.go

@@ -243,7 +243,6 @@ func (this *ActivityController) ActivityListNew() {
 		imgUrlChart = vslice[len(vslice)-1]
 		mapChart[chartName] = imgUrlChart
 	}
-
 	for k, v := range list {
 		if strings.Contains(v.ActivityName, "【") {
 			list[k].IsBrackets = 1
@@ -254,6 +253,7 @@ func (this *ActivityController) ActivityListNew() {
 		if isShow && strings.Contains(v.ChartPermissionName, "研选") {
 			list[k].IsShowSustainable = true
 		}
+
 		if strings.Contains(v.ChartPermissionName, "研选") && v.ActivityTypeId == 1 {
 			list[k].ActivityTypeName = "买方研选电话会"
 			list[k].ImgUrlText = utils.YAN_XUAN_IMG

+ 1 - 1
controllers/report.go

@@ -629,7 +629,7 @@ func (this *ReportController) IndustrialFllow() {
 		br.ErrMsg = "产业ID不存在:" + strconv.Itoa(industrialManagementId)
 		return
 	}
-	count, err := models.GetCountCygxIndustryFllow(industrialManagementId, user.Mobile, condition)
+	count, err := models.GetCountCygxIndustryFllow(industrialManagementId, user.UserId, condition)
 	if err != nil {
 		br.Msg = "获取数据失败!"
 		br.ErrMsg = "获取数据失败,Err:" + err.Error()

+ 3 - 3
models/industrial_management.go

@@ -206,9 +206,9 @@ func GetIndustrialManagementCount(IndustrialManagementId int) (count int, err er
 }
 
 //获取关注数量
-func GetCountCygxIndustryFllow(industrialManagementId int, mobile, condition string) (count int, err error) {
-	sql := `SELECT COUNT(1) AS count FROM cygx_industry_fllow WHERE mobile=? AND industrial_management_id=? ` + condition
-	err = orm.NewOrm().Raw(sql, mobile, industrialManagementId).QueryRow(&count)
+func GetCountCygxIndustryFllow(industrialManagementId, userId int, condition string) (count int, err error) {
+	sql := `SELECT COUNT(1) AS count FROM cygx_industry_fllow WHERE user_id=? AND industrial_management_id=? ` + condition
+	err = orm.NewOrm().Raw(sql, userId, industrialManagementId).QueryRow(&count)
 	return
 }