Browse Source

Merge branch 'dev2.0' into dev2.1

* dev2.0:
  xg
  no message

# Conflicts:
#	src/front/project.go
Jianghan 2 years ago
parent
commit
81090b3074
1 changed files with 1 additions and 1 deletions
  1. 1 1
      src/front/project.go

+ 1 - 1
src/front/project.go

@@ -1181,7 +1181,7 @@ func GetDataById(idInfoArr []util.Data, importType, s_sourceinfo string, success
 				//2.查extract
 				extData, _ := util.MgoE.FindById(util.ExtColl1, id, map[string]interface{}{"attach_text": 0})
 				if extData == nil || len(*extData) == 0 {
-					extData, _ = util.MgoE.FindById(util.ExtColl2, id, map[string]interface{}{"attach_text": 0})
+					extData, _ = util.MgoE.FindById(util.ExtColl2, id, map[string]interface{}{"attach_text": 0, "field_source": 0})
 				}
 				//抽取表字段合并到bidding
 				if extData != nil && len(*extData) > 0 {