|
@@ -1134,8 +1134,8 @@ func GetDataById(idInfoArr []util.Data, importType, s_sourceinfo string, success
|
|
|
// 6.es查询项目合并信息
|
|
// 6.es查询项目合并信息
|
|
|
esQ := `{"query":{"bool":{"must":[{"term":{"ids":"` + id + `"}}]}}}`
|
|
esQ := `{"query":{"bool":{"must":[{"term":{"ids":"` + id + `"}}]}}}`
|
|
|
info := util.Es.Get("projectset", "projectset", esQ)
|
|
info := util.Es.Get("projectset", "projectset", esQ)
|
|
|
- projectId := qu.ObjToString((*info)[0]["_id"])
|
|
|
|
|
- if projectId != "" && len(projectId) == 24 { //舍弃项目id为空和合并错误的
|
|
|
|
|
|
|
+ if len(*info) > 0 {
|
|
|
|
|
+ projectId := qu.ObjToString((*info)[0]["_id"])
|
|
|
project, _ := util.MgoE.FindById(util.ProjectColl, projectId, map[string]interface{}{"ids": 1})
|
|
project, _ := util.MgoE.FindById(util.ProjectColl, projectId, map[string]interface{}{"ids": 1})
|
|
|
if project != nil && len(*project) > 0 {
|
|
if project != nil && len(*project) > 0 {
|
|
|
ids := qu.ObjArrToStringArr((*project)["ids"].([]interface{}))
|
|
ids := qu.ObjArrToStringArr((*project)["ids"].([]interface{}))
|
