no message

models/activity.go

@@ -383,6 +383,7 @@ func GetActivitySpecialSearcheList(condition string, pars []interface{}, conditi
 			art.limit_people_num,
 			1 AS source_type,
             t.img_url_text,
+            art.city,
 			art.activity_time 
 		FROM
 			cygx_activity AS art
@@ -412,6 +413,7 @@ func GetActivitySpecialSearcheList(condition string, pars []interface{}, conditi
 			"",
 			2 AS source_type,
 			"",
+			"",
 			art.activity_time 
 		FROM
 			cygx_activity_special AS art

models/user.go

@@ -221,8 +221,8 @@ func GetCompanyPermission(companyId int) (permission string, err error) {
 	return
 }
 
-func GetCompanyPermissionRemark(companyId int) (permission string, err error) {
-	sql := ` SELECT GROUP_CONCAT(DISTINCT b.remark  ORDER BY b.sort ASC SEPARATOR ',') AS permission
+func GetCompanyPermissionName(companyId int) (permission string, err error) {
+	sql := ` SELECT GROUP_CONCAT(DISTINCT b.chart_permission_name  ORDER BY b.sort ASC SEPARATOR ',') AS permission
 			FROM company_report_permission AS a
 			INNER JOIN chart_permission AS b ON a.chart_permission_id=b.chart_permission_id
 			INNER JOIN company_product AS c ON a.company_id=c.company_id AND a.product_id=c.product_id

services/user_permission.go

@@ -63,7 +63,7 @@ func GetUserRaiPermissionInfo(userId, companyId int) (authInfo models.UserPermis
 	}
 
 	// permissions示例: 医药,消费,科技,智造,策略,专家,买方研选
-	permissions, e := models.GetCompanyPermission(companyId)
+	permissions, e := models.GetCompanyPermissionName(companyId)
 	if e != nil {
 		err = errors.New("获取客户权限失败, Err: " + e.Error())
 		return