Преглед изворни кода

作者最新产业bug处理

xingzai пре 3 година
родитељ
комит
221ea318a2
2 измењених фајлова са 4 додато и 5 уклоњено
  1. 1 1
      controllers/report.go
  2. 3 4
      models/article_department.go

+ 1 - 1
controllers/report.go

@@ -708,7 +708,7 @@ func (this *ReportController) IndustryListByDepartment() {
 			list[k].IsMyFollow = true
 		}
 	}
-	resp.ListnNew, err = models.GetIndustrialSubjectByDepartmentNew(chartPermissionId)
+	resp.ListnNew, err = models.GetIndustrialSubjectByDepartmentNew()
 	if err != nil {
 		br.Msg = "获取信息失败"
 		br.ErrMsg = "获取品种信息失败,Err:" + err.Error()

+ 3 - 4
models/article_department.go

@@ -113,7 +113,7 @@ func GetIndustrialSubjectByDepartment(departmentId int) (items []*IndustrialMana
 }
 
 //最新产业列表
-func GetIndustrialSubjectByDepartmentNew(industrialManagementId int) (items []*IndustrialManagementIdInt, err error) {
+func GetIndustrialSubjectByDepartmentNew() (items []*IndustrialManagementIdInt, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT m.*, MAX( a.publish_date ) art_time
 			FROM
@@ -121,15 +121,14 @@ func GetIndustrialSubjectByDepartmentNew(industrialManagementId int) (items []*I
 			INNER JOIN cygx_article AS a ON a.department_id = d.department_id
 			INNER JOIN cygx_industrial_article_group_management AS mg ON mg.article_id = a.article_id
 			INNER JOIN cygx_industrial_management AS m ON m.industrial_management_id = mg.industrial_management_id 
-			WHERE 1 = 1 
-			AND m.chart_permission_id = ?
+			WHERE 1 = 1
 			AND a.publish_status=1 
 			AND a.subject_ids != ''
 			AND a.is_report=1 
 			GROUP BY
 			m.industrial_management_id 
 			ORDER BY art_time DESC LIMIT 6 `
-	_, err = o.Raw(sql, industrialManagementId).QueryRows(&items)
+	_, err = o.Raw(sql).QueryRows(&items)
 	return
 }