Merge branch 'cygx_12.8' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

controllers/activity.go

@@ -2603,13 +2603,14 @@ func (this *ActivityCoAntroller) LabelTypeListV5() {
 	}
 	//研选互动不展示专项产业调研
 	if !isResearch {
-		conditionActivitySpecial := services.ActivityLabelSpecialSql(chartPermissionIds, whichDay, activeState)
-		//查询专项产业调研展示权限 仅对大套餐客户跟永续客户展示
-		//if whichDay == "" {
 		//专项产业调研未开始状态不查询
 		if activeState == "1" {
 			activeState = ""
 		}
+		conditionActivitySpecial := services.ActivityLabelSpecialSql(chartPermissionIds, whichDay, activeState)
+		//查询专项产业调研展示权限 仅对大套餐客户跟永续客户展示
+		//if whichDay == "" {
+
 		//speciaItem, err := services.GetActivityLabelSpecialList(user, isPower, chartPermissionIds, permissionNameStr)
 		speciaItem, err := services.GetActivityLabelSpecialList(user, conditionActivitySpecial, activeState)
 		if err != nil {

controllers/yanxuan_special.go

@@ -378,8 +378,8 @@ func (this *YanxuanSpecialController) Save() {
 			return
 		}
 		item.UserId = specialItem.UserId // 专栏userid还是原有userId
-
 		authorUserId = specialItem.UserId
+		item.AdminName = sysUser.RealName //审核人员姓名
 	}
 
 	specialId := 0

models/cygx_yanxuan_special.go

@@ -22,6 +22,7 @@ type CygxYanxuanSpecial struct {
 	Type         int       // 类型1:笔记，2:观点
 	CompanyTags  string    // 公司标签
 	IndustryTags string    // 行业标签
+	AdminName    string    // 审核人员姓名
 }
 
 type CygxYanxuanSpecialItem struct {
@@ -218,8 +219,8 @@ func UpdateYanxuanSpecial(item *CygxYanxuanSpecial) (err error) {
 	o := orm.NewOrm()
 	sql := ``
 	sql = `UPDATE cygx_yanxuan_special SET title=?,content=?,company_tags=?,industry_tags=?,img_url=?,doc_url=?,type=?,status=?,
-	modify_time=NOW(),publish_time=NOW() WHERE id = ? `
-	_, err = o.Raw(sql, item.Title, item.Content, item.CompanyTags, item.IndustryTags, item.ImgUrl, item.DocUrl, item.Type, item.Status, item.Id).Exec()
+	modify_time=NOW(),publish_time=NOW(),admin_name = ? WHERE id = ? `
+	_, err = o.Raw(sql, item.Title, item.Content, item.CompanyTags, item.IndustryTags, item.ImgUrl, item.DocUrl, item.Type, item.Status, item.AdminName, item.Id).Exec()
 	return
 }