附件匹配修改

customerdata/src/util.go

@@ -665,27 +665,41 @@ func AssembelSave(tmp map[string]interface{}, IsSearchHosp, IsSearchEnps bool, a
 		}
 	}*/
 	//匹配公告附件
-	filesArr := []map[string]interface{}{}
 	info := MgoBidding.FindOne(BiddingColl, map[string]interface{}{"_id": mongodb.StringTOBsonId(id)})
 	if info != nil && len(info) > 0 {
 		if info["projectinfo"] != nil {
 			projectInfo := qu.ObjToMap(info["projectinfo"])
 			if (*projectInfo)["attachments"] != nil {
+				filesArr := []map[string]interface{}{}
 				fileUrl := Sysconfig.FileUrl
 				attachments := (*projectInfo)["attachments"].(map[string]interface{})
 				for _, v := range attachments {
 					atta := v.(map[string]interface{})
-					fileMap := map[string]interface{}{
-						"filename": atta["filename"],
-						"url":      fileUrl + qu.ObjToString(atta["ossid"]),
+					if atta["fid"] != nil {
+						fileMap := map[string]interface{}{
+							"filename": atta["filename"],
+							"url":      fileUrl + qu.ObjToString(atta["fid"]),
+						}
+						filesArr = append(filesArr, fileMap)
+					} else {
+						if atta["org_url"] != nil {
+							fileMap := map[string]interface{}{
+								"filename": atta["filename"],
+								"url":      qu.ObjToString(atta["org_url"]),
+							}
+							filesArr = append(filesArr, fileMap)
+						}
 					}
-					filesArr = append(filesArr, fileMap)
+
+				}
+				log.Println("查询附件结果：", id, "附件数量：", len(filesArr))
+				if len(filesArr) > 0 {
+					tmp["filehref"] = filesArr
 				}
 			}
 		}
 	}
-	log.Println("查询附件结果：", id, len(filesArr))
-	tmp["files"] = filesArr
+
 	redis.Put("datag", appid+"_"+id, 1, 3*24*60*60)
 	MgoSaveCache <- tmp
 	return true