Merge branch 'refs/heads/eta_2.2.0_document_manage_0919@guomengyuan' into debug

models/document_manage_model/outside_report.go

@@ -52,7 +52,7 @@ func init() {
 // GetOutsideReportListByConditionCount 根据条件查询列表条数
 func GetOutsideReportListByConditionCount(condition string, pars []interface{}) (count int, err error) {
 	o := orm.NewOrmUsingDB("rddp")
-	sql := `select count(distinct t1.outside_report_id) from outside_report t1 inner join chart_permission_search_key_word_mapping t2 on t1.classify_id = t2.classify_id  where 1 = 1 `
+	sql := `select count(distinct t1.outside_report_id) from outside_report t1 left join chart_permission_search_key_word_mapping t2 on t1.classify_id = t2.classify_id  where 1 = 1 `
 	sql += condition
 	err = o.Raw(sql, pars).QueryRow(&count)
 	if err != nil {

services/document_manage_service/document_manage_service.go

@@ -188,7 +188,7 @@ func DocumentReportList(documentType int, chartPermissionIdList []string, classi
 		}
 	}
 	if keyword != "" {
-		condition += ` and t1.title like ? or t1.sys_user_name like ?`
+		condition += ` and (t1.title like ? or t1.sys_user_name like ? )`
 		pars = append(pars, "%"+keyword+"%", "%"+keyword+"%")
 	}