Merge branch 'master' of 10.10.14.250:huanghai/dsMin

dsDataex/MyService/DataEX/DataexService/DataexService.go

@@ -415,20 +415,10 @@ func DataexSetBatch(systemID string, datas []MySwagger.Data,datasource *models.T
 			json.Unmarshal([]byte(datas[no].Data), &jsonData)
 
 			esData2.DataContent=jsonData
-			//re, datasourceId := ValidationUtil.GetDatasourceIdByCode(esData2.DatasourceId)
-			//var r = false
-			//if re == true {
-			//	r, _ = ValidationUtil.ValidESDataContent(datasourceId, esData2.DataContent)
-			//}
 
 			//数据校验：1、机构校验
-			flag,_,data,_:= DataexDAO.CheckProvideOrgID(datasource.ProvideType,datasource.ProvideOrgid,datas[no].OrgID)
-
-			//fmt.Println("flag::", flag)
-
+			flag, _, data, _ := DataexDAO.CheckProvideOrgID(datasource.ProvideType,datasource.ProvideOrgid,datas[no].OrgID)
 			if flag==true {
-
-				//result, failMessages := ValidationUtil.ValidESDataContent(datasourceId, esData2.DataContent)
 				var result=true
 				var failMessages=""
 
@@ -480,8 +470,15 @@ func DataexSetBatch(systemID string, datas []MySwagger.Data,datasource *models.T
 		}
 
 		if indexData==nil {
+			// modify by wangshuai 2020-09-28
+			if len(failIDs)>0{
+				var failResults []MySwagger.FailResult
+				for no:=0;no< len(failIDs);no++{
+					failResults=append(failResults,MySwagger.FailResult{FailID: failIDs[no],FailReason: "数据机构权限全部不正确",	})
+				}
+				DataexDAO.SaveDataError(failResults, datas, systemID, datasource.DatasourceCode )
+			}
 			failIDs=nil
-			DataexDAO.SaveDataError(nil, datas, systemID, datasource.DatasourceCode )
 			return false,"数据机构权限全部不正确",nil,nil
 		}
 

dsSupport/MyModel/DataSource/DatasourceDAO/DatasourceDAO.go

@@ -2,6 +2,7 @@ package DatasourceDAO
 
 import (
 	"dsSupport/MyModel/MySwagger"
+	"dsSupport/Utils/CommonUtil"
 	"dsSupport/Utils/DbUtil"
 	"dsSupport/Utils/ErrorConst"
 	"dsSupport/Utils/LogUtil"
@@ -44,7 +45,19 @@ func GetDatasourceResults(query MySwagger.DatasourceQuery) (bool, string, int, [
 	//分页数据
 	list, err := DbUtil.Engine.SQL(pageSql, limit, offset).Query().List()
 	if list != nil {
-		return true, "数据获取成功", count, list, err
+		listJson, _ :=json.Marshal(list)
+
+		sql1 := "SELECT * FROM t_dataex_orgtree"
+		//var offset1 = (query.Page - 1) * 10
+		//conditionSql1 := fmt.Sprintf("%s", " limit ? offset ? ")
+		//pageSql1 := fmt.Sprintf("%s %s", sql1, conditionSql1)
+		joinList1, _ := DbUtil.Engine.SQL(sql1).Query().List()
+		joinListJson1, _ := json.Marshal(joinList1)
+		mergedList := CommonUtil.ListMerge(string(listJson), string(joinListJson1), "provide_orgid", "id", "provide_orgname", "org_name")
+		var datas []map[string]interface{}
+
+		json.Unmarshal([]byte(mergedList), &datas)
+		return true, "数据获取成功", count, datas, err
 	} else {
 		return false, "数据获取失败，数据源不存在", count, nil, nil
 	}