Browse Source

no message

xingzai 2 years ago
parent
commit
8156e79c1b
1 changed files with 6 additions and 11 deletions
  1. 6 11
      models/report.go

+ 6 - 11
models/report.go

@@ -94,10 +94,7 @@ func GetReoprtSearchCountYx(condition string) (count int, err error) {
 	sql := `SELECT
 			COUNT( 1 ) AS count 
 		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 
+			cygx_article AS a
 		WHERE
 			1 = 1`
 	if condition != "" {
@@ -112,9 +109,7 @@ func GetReoprtSearchCountHz(condition string) (count int, err error) {
 	sql := `SELECT
 			COUNT( 1 ) AS count 
 		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
+			cygx_article AS a
 		WHERE
 			1 = 1`
 	if condition != "" {
@@ -631,8 +626,8 @@ func GetArticleResearchList(condition string, pars []interface{}, startSize, pag
 			( SELECT count( 1 ) FROM cygx_article_collect AS ac WHERE ac.article_id = a.article_id  AND user_id = ? ) AS my_collect_num
 		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
+			LEFT JOIN cygx_industrial_article_group_management AS mg ON mg.article_id = a.article_id
+			LEFT 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 
 		WHERE
 			1 = 1  AND a.publish_status = 1  `
@@ -661,8 +656,8 @@ func GetArticleResearchListHz(condition string, pars []interface{}, startSize, p
 			( SELECT count( 1 ) FROM cygx_article_collect AS ac WHERE ac.article_id = a.article_id  AND user_id = ? ) AS my_collect_num
 		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
+			LEFT JOIN cygx_industrial_article_group_management AS mg ON mg.article_id = a.article_id
+			LEFT JOIN cygx_industrial_management AS m ON m.industrial_management_id = mg.industrial_management_id
 		WHERE
 			1 = 1  AND a.publish_status = 1  `
 	if condition != "" {