研选模块，研选买方更换

controllers/research.go

@@ -34,13 +34,7 @@ func (this *ResearchController) NewList() {
 		br.Msg = "请输入分类ID"
 		return
 	}
-	categoryinfo, err := models.GetChartPermissionById(chartPermissionId)
-	if err != nil {
-		br.Msg = "获取信息失败"
-		br.ErrMsg = "获取信息失败,Err:" + err.Error()
-		return
-	}
-	list, err := models.GetIndustrialManagementNewList(categoryinfo.PermissionName)
+	list, err := models.GetIndustrialManagementNewList()
 	if err != nil {
 		br.Msg = "获取信息失败"
 		br.ErrMsg = "获取品种信息失败,Err:" + err.Error()
@@ -49,7 +43,7 @@ func (this *ResearchController) NewList() {
 	mapHot := make(map[string]int)
 
 	condition := ` ORDER BY sum_num DESC  `
-	listHot, err := models.GetThemeHeatList(categoryinfo.PermissionName, user.UserId, condition, 0, 3)
+	listHot, err := models.GetThemeHeatList(user.UserId, condition, 0, 3)
 	if err != nil {
 		br.Msg = "获取信息失败"
 		br.ErrMsg = "获取品种信息失败,Err:" + err.Error()
@@ -93,14 +87,8 @@ func (this *ResearchController) CollectionList() {
 		br.Msg = "请输入分类ID"
 		return
 	}
-	categoryinfo, err := models.GetChartPermissionById(chartPermissionId)
-	if err != nil {
-		br.Msg = "获取信息失败"
-		br.ErrMsg = "获取信息失败,Err:" + err.Error()
-		return
-	}
 	var condition string
-	condition = `  AND a.category_name LIKE '%` + categoryinfo.PermissionName + `%' AND publish_status = 1 GROUP BY a.article_id ORDER BY collect_num_order DESC, publish_date DESC LIMIT 15 `
+	condition = `   AND a.article_type_id > 0  AND publish_status = 1 GROUP BY a.article_id ORDER BY collect_num_order DESC, publish_date DESC LIMIT 15 `
 	list, err := models.GetArticleCollectionList(condition, user.UserId)
 	if err != nil {
 		br.Msg = "获取信息失败"
@@ -162,26 +150,21 @@ func (this *ResearchController) HotList() {
 	} else {
 		condition = `ORDER BY publish_date DESC `
 	}
-	categoryinfo, err := models.GetChartPermissionById(chartPermissionId)
-	if err != nil {
-		br.Msg = "获取信息失败"
-		br.ErrMsg = "获取信息失败,Err:" + err.Error()
-		return
-	}
-	total, err := models.GetThemeHeatListCount(categoryinfo.PermissionName, "")
+
+	total, err := models.GetThemeHeatListCount("")
 	if err != nil {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取失败，Err:" + err.Error()
 		return
 	}
-	list, err := models.GetThemeHeatList(categoryinfo.PermissionName, user.UserId, condition, startSize, pageSize)
+	list, err := models.GetThemeHeatList(user.UserId, condition, startSize, pageSize)
 	if err != nil {
 		br.Msg = "获取信息失败"
 		br.ErrMsg = "获取品种信息失败,Err:" + err.Error()
 		return
 	}
 	newMap := make(map[int]string)
-	listNew, err := models.GetIndustrialManagementNewList(categoryinfo.PermissionName)
+	listNew, err := models.GetIndustrialManagementNewList()
 	if err != nil {
 		br.Msg = "获取信息失败"
 		br.ErrMsg = "获取产业最新信息失败,Err:" + err.Error()
@@ -190,7 +173,7 @@ func (this *ResearchController) HotList() {
 	for _, v := range listNew {
 		newMap[v.IndustrialManagementId] = v.IndustryName
 	}
-	condition = ` AND a.category_name LIKE '%` + categoryinfo.PermissionName + `%' `
+	condition = ` AND a.article_type_id > 0  `
 	listSubjcet, err := models.GetThemeHeatSubjectList(condition)
 	if err != nil {
 		br.Msg = "获取信息失败"
@@ -200,7 +183,7 @@ func (this *ResearchController) HotList() {
 	mapHot := make(map[string]int)
 
 	condition = ` ORDER BY sum_num DESC `
-	listHot, err := models.GetThemeHeatList(categoryinfo.PermissionName, user.UserId, condition, 0, 3)
+	listHot, err := models.GetThemeHeatList(user.UserId, condition, 0, 3)
 	if err != nil {
 		br.Msg = "获取信息失败"
 		br.ErrMsg = "获取品种信息失败,Err:" + err.Error()
@@ -257,19 +240,14 @@ func (this *ResearchController) KolList() {
 		br.Msg = "请输入分类ID"
 		return
 	}
-	categoryinfo, err := models.GetChartPermissionById(chartPermissionId)
-	if err != nil {
-		br.Msg = "获取信息失败"
-		br.ErrMsg = "获取信息失败,Err:" + err.Error()
-		return
-	}
-	list, err := models.GetDepartmentList(categoryinfo.PermissionName, user.UserId)
+
+	list, err := models.GetDepartmentList(user.UserId)
 	if err != nil {
 		br.Msg = "获取信息失败"
 		br.ErrMsg = "获取品种信息失败,Err:" + err.Error()
 		return
 	}
-	listIndustrial, err := models.GetIndustrialDepartmentList(categoryinfo.PermissionName)
+	listIndustrial, err := models.GetIndustrialDepartmentList()
 	if err != nil {
 		br.Msg = "获取信息失败"
 		br.ErrMsg = "获取品种信息失败,Err:" + err.Error()

models/industrial_management.go

@@ -358,7 +358,7 @@ type IndustrialManagementNewList struct {
 }
 
 //近期更新主题列表
-func GetIndustrialManagementNewList(permissionName string) (items []*IndustrialManagementNewResp, err error) {
+func GetIndustrialManagementNewList() (items []*IndustrialManagementNewResp, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT
 			m.industrial_management_id,
@@ -371,7 +371,7 @@ func GetIndustrialManagementNewList(permissionName string) (items []*IndustrialM
 			INNER JOIN cygx_industrial_management AS m ON m.industrial_management_id = mg.industrial_management_id 
 		WHERE
 			1 = 1
-			AND a.category_name LIKE '%` + permissionName + `%' 
+			AND a.article_type_id > 0
 			AND publish_status = 1 
 		GROUP BY
 			m.industrial_management_id 

models/report.go

@@ -379,7 +379,7 @@ type IndustrialManagementHotListResp struct {
 }
 
 //产业列表
-func GetThemeHeatList(permissionName string, userId int, condition string, startSize, pageSize int) (items []*IndustrialManagementHotResp, err error) {
+func GetThemeHeatList(userId int, condition string, startSize, pageSize int) (items []*IndustrialManagementHotResp, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT
 			m.industry_name,
@@ -395,7 +395,7 @@ func GetThemeHeatList(permissionName string, userId int, condition string, start
 			LEFT JOIN cygx_industrial_activity_group_management as ag ON ag.industrial_management_id = mg.industrial_management_id
 		WHERE
 			1 = 1
-			AND a.category_name LIKE '%` + permissionName + `%' 
+			AND a.article_type_id > 0
 			AND publish_status = 1 
 			GROUP BY m.industrial_management_id ` + condition + ` LIMIT ?,?`
 	_, err = o.Raw(sql, userId, startSize, pageSize).QueryRows(&items)
@@ -403,7 +403,7 @@ func GetThemeHeatList(permissionName string, userId int, condition string, start
 }
 
 //获取数量
-func GetThemeHeatListCount(permissionName, condition string) (count int, err error) {
+func GetThemeHeatListCount(condition string) (count int, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT   COUNT( DISTINCT m.industrial_management_id ) FROM
 			cygx_industrial_management AS m
@@ -412,8 +412,7 @@ func GetThemeHeatListCount(permissionName, condition string) (count int, err err
 			LEFT JOIN cygx_industrial_activity_group_management as ag ON ag.industrial_management_id = mg.industrial_management_id
 		WHERE
 			1 = 1
-			AND a.category_name LIKE '%` + permissionName + `%' 
-			AND a.publish_status = 1  ` + condition
+			AND a.article_type_id > 0 AND a.publish_status = 1  ` + condition
 	err = o.Raw(sql).QueryRow(&count)
 	return
 }
@@ -463,7 +462,7 @@ type IndustrialDepartmentListResp struct {
 }
 
 //作者列表
-func GetDepartmentList(permissionName string, userId int) (items []*DepartmentResp, err error) {
+func GetDepartmentList(userId int) (items []*DepartmentResp, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT
 			d.nick_name,
@@ -476,7 +475,7 @@ func GetDepartmentList(permissionName string, userId int) (items []*DepartmentRe
 			INNER JOIN cygx_article AS a ON d.department_id = a.department_id
 		WHERE
 			1 = 1
-			AND a.category_name LIKE '%` + permissionName + `%' 
+			AND a.article_type_id > 0 
 			AND publish_status = 1 
 		GROUP BY
 				d.department_id
@@ -488,7 +487,7 @@ func GetDepartmentList(permissionName string, userId int) (items []*DepartmentRe
 }
 
 //作者文章所关联的产业列表
-func GetIndustrialDepartmentList(permissionName string) (items []*IndustrialDepartmentListResp, err error) {
+func GetIndustrialDepartmentList() (items []*IndustrialDepartmentListResp, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT
 			m.industrial_management_id,
@@ -501,7 +500,7 @@ func GetIndustrialDepartmentList(permissionName string) (items []*IndustrialDepa
 			INNER JOIN cygx_industrial_management AS m ON m.industrial_management_id = mg.industrial_management_id 
 		WHERE
 			1 = 1
-			AND a.category_name LIKE '%` + permissionName + `%' 
+			AND a.article_type_id > 0
 			AND publish_status = 1 
 		GROUP BY
 			a.article_id