12.25---------------修改

fullproject/src_v1/project.go

@@ -209,7 +209,6 @@ func (p *ProjectTask) startProjectMerge(info *Info, tmp map[string]interface{})
 					}
 				}
 			}
-			log.Println("pid", findPid)
 			choose, ex := CompareStatus(resN[0], info)
 			if !choose {
 				p.UpdateProject(tmp, info, resN[0], kv+1, resN[0].comStr, ex)

fullproject/src_v1/task.go

@@ -463,26 +463,28 @@ func (p *ProjectTask) CommonMerge(tmp map[string]interface{}) {
 	info := ParseInfo(tmp)
 	if info != nil && !((info.pnbval == 1 && info.Buyer != "") || info.pnbval == 0) {
 		if jsonData, ok := tmp["jsondata"].(map[string]interface{}); ok {
-			if jsonData != nil && jsonData["projecthref"] != "" {
+			if jsonData != nil && jsonData["projecthref"] != nil {
 				//projectHref字段合并
 				proHref := jsonData["projecthref"].(string)
 				tmp["projecthref"] = proHref
 				p.mapHrefLock.Lock()
 				defer p.mapHrefLock.Unlock()
+				p.AllIdsMapLock.Lock()
+				defer p.AllIdsMapLock.Unlock()
 				if p.mapHref[proHref] != "" {
 					pid := p.mapHref[proHref]
-					p.AllIdsMapLock.Lock()
 					comparePro := p.AllIdsMap[pid].P
-					p.AllIdsMapLock.Unlock()
 					_, ex := CompareStatus(comparePro, info)
 					p.UpdateProject(tmp, info, comparePro, -1, "AAAAAAAAAA", ex)
 				} else {
 					id, p1 := p.NewProject(tmp, info)
 					p.mapHref[proHref] = id
-					p.AllIdsMapLock.Lock()
 					p.AllIdsMap[id] = &ID{Id: id, P: p1}
-					p.AllIdsMapLock.Unlock()
 				}
+			}else {
+				//项目合并
+				p.currentTime = info.Publishtime
+				p.startProjectMerge(info, tmp)
 			}
 		}else {
 			//项目合并