no message

controllers/report.go

@@ -2291,7 +2291,7 @@ func (this *ReportController) SearchResource() {
 	for k, v := range listYx {
 		for _, v2 := range listSubjcet {
 			if v2.IndustrialManagementId == v.IndustrialManagementId {
-				listHz[k].IndustrialSubjectList = append(listHz[k].IndustrialSubjectList, v2)
+				listYx[k].IndustrialSubjectList = append(listYx[k].IndustrialSubjectList, v2)
 			}
 		}
 	}

models/report.go

@@ -555,13 +555,12 @@ func GetThemeDetail(userId, industrialManagementId int) (items []*GetThemeDetail
 		FROM
 			cygx_article AS a
 			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
-			INNER JOIN cygx_article_department AS d ON d.department_id = a.department_id
+			LEFT JOIN cygx_industrial_management AS m ON m.industrial_management_id = mg.industrial_management_id
+			LEFT JOIN cygx_article_department AS d ON d.department_id = a.department_id
 			LEFT JOIN cygx_industrial_article_group_subject AS sg ON sg.article_id = a.article_id
 			LEFT JOIN cygx_industrial_subject AS s ON s.industrial_subject_id = sg.industrial_subject_id 
 		WHERE
 			1 = 1
-			AND a.category_name LIKE '%研选%' 
 			AND m.industrial_management_id = ? 
 			AND publish_status = 1 
 		ORDER BY