Merge branch 'out_report_2.1' into debug

models/document_manage_model/outside_report.go

@@ -65,7 +65,7 @@ func GetOutsideReportListByConditionCount(condition string, pars []interface{})
 // GetOutsideReportListByCondition 根据条件查询列表
 func GetOutsideReportListByCondition(condition string, pars []interface{}, currentIndex int, pageSize int) (list []OutsideReport, err error) {
 	o := orm.NewOrmUsingDB("rddp")
-	sql := `select distinct t1.outside_report_id, t1.source, t1.title, t1.abstract, t1.classify_id, 
+	sql := `select t1.outside_report_id, t1.source, t1.title, t1.abstract, t1.classify_id, 
 t1.classify_name, t1.sys_user_id, t1.sys_user_name, t1.email_message_uid, t1.report_update_time, 
 t1.modify_time, t1.create_time, t1.report_code from outside_report t1 
 left join chart_permission_search_key_word_mapping t2 on t1.classify_id = t2.classify_id  where 1 = 1 `

services/document_manage_service/document_manage_service.go

@@ -174,9 +174,9 @@ func DocumentReportList(documentType int, chartPermissionIdList []string, classi
 	}
 
 	if orderField != "" && orderType != "" {
-		condition += ` order by t1.` + orderField + ` ` + orderType
+		condition += ` group by t1.outside_report_id order by t1.` + orderField + ` ` + orderType
 	} else {
-		condition += ` order by t1.modify_time desc`
+		condition += ` group by t1.outside_report_id order by t1.report_update_time desc`
 	}
 
 	outsideReportList, err := document_manage_model.GetOutsideReportListByCondition(condition, pars, startSize, pageSize)
@@ -260,9 +260,9 @@ func RuiSiReportList(classifyIdFirst, classifyIdSecond, classifyIdThird int, cha
 	}
 
 	if orderField != "" && orderType != "" {
-		condition += ` order by a.` + orderField + ` ` + orderType
+		condition += ` group by a.id order by a.` + orderField + ` ` + orderType
 	} else {
-		condition += ` order by a.publish_time desc`
+		condition += ` group by a.id order by a.publish_time desc`
 	}
 
 	reportList, err := models.GetReportListByCondition(condition, pars, startSize, pageSize)