Merge branch 'eta_bug_pci_report_1126@guomengyuan' into debug

# Conflicts:
#	models/data_manage/edb_info.go
#	utils/constants.go

models/data_manage/edb_info.go

@@ -230,6 +230,12 @@ type BatchAddCheckReq struct {
 	IndexCodes []string `form:"IndexCodes" description:"全选为false时, 该数组为选中; 全选为true时, 该数组为不选的指标"`
 }
 
+// MysteelChemicalDataBatchAddCheckReq 钢联化工指标批量添加校验
+type MysteelChemicalDataBatchAddCheckReq struct {
+	// MysteelChemicalDataListReq
+	IndexCodes []string `form:"IndexCodes" description:"全选为false时, 该数组为选中; 全选为true时, 该数组为不选的指标"`
+}
+
 type EiaSteoDataBatchAddCheckReq struct {
 	IndexCodes []string `description:"指标编码"`
 }

models/document_manage_model/outside_report.go

@@ -52,13 +52,11 @@ func init() {
 // GetOutsideReportListByConditionCount 根据条件查询列表条数
 func GetOutsideReportListByConditionCount(condition string, pars []interface{}) (count int, err error) {
 	o := orm.NewOrmUsingDB("rddp")
-	sql := `select count(1) from ( 
-			SELECT COUNT( DISTINCT t1.outside_report_id ) 
+	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
-	sql += ` ) t`
 
 	err = o.Raw(sql, pars).QueryRow(&count)
 	if err != nil {

services/data/edb_info.go

@@ -3241,6 +3241,7 @@ func GetMySteelSourceByEdbCode(edbCode string) (source int, item *data_manage.Ed
 		}
 		if tmpInfo != nil {
 			source = utils.DATA_SOURCE_MYSTEEL_CHEMICAL
+			return
 		}
 	}
 
@@ -3255,6 +3256,7 @@ func GetMySteelSourceByEdbCode(edbCode string) (source int, item *data_manage.Ed
 		}
 		if tmpInfo != nil {
 			source = utils.DATA_SOURCE_GL
+			return
 		}
 	}