tijiao

src/jfw/modules/bigmember/src/service/follow/project.go

@@ -188,16 +188,13 @@ func (this *FollowProject) FollowDetail() {
 		if fid == "" {
 			fid, _, _ = projectManager.FollowedCheck(sid)
 		}
-		followData, projectInfo := map[string]interface{}{}, map[string]interface{}{}
-		if fid != "" { //已关注 查询详情
+		var followData, projectInfo map[string]interface{}
+		if fid != "" { //已关注 查询详情z
 			followData, projectInfo, err = projectManager.GetDetailByFid(fid)
-			followData["fid"] = util.EncodeId(fid)
 			sid = qutil.ObjToString(followData["sid"])
 			if sid != "" { //关注项目的来源信息id
 				followData["sid"] = util.EncodeId(sid)
 			}
-		} else {
-			followData["fid"] = ""
 		}
 		//查询项目信息
 		if projectInfo == nil {
@@ -207,7 +204,7 @@ func (this *FollowProject) FollowDetail() {
 			}
 		}
 		//查询结果合并
-		return mergeFollowDetail(followData, projectInfo, sid)
+		return mergeFollowDetail(followData, projectInfo, sid, fid)
 	}()
 	if errMsg != nil {
 		log.Printf("%s 项目关注详情页出错:%s\n", userId, errMsg.Error())
@@ -226,16 +223,17 @@ func GetWinnerFromProjectSet(sid string) (winner string) {
 	}
 	return
 }
-func mergeFollowDetail(followInfo, projectInfo map[string]interface{}, sid string) (map[string]interface{}, error) {
+func mergeFollowDetail(followInfo, projectInfo map[string]interface{}, sid, fid string) (map[string]interface{}, error) {
 	//未关注查看项目信息
 	visitArr := []string{}
 	if followInfo == nil {
 		followInfo = map[string]interface{}{
-			"isfollow":    false,              //是否关注
-			"sid":         util.EncodeId(sid), //关注项目的来源信息id
-			"remind":      0,                  //是否开启提醒
-			"bidopentime": nil,                //开标时间
-			"remindtime":  nil,                //提醒时间
+			"isfollow":    false,                                       //是否关注
+			"sid":         util.EncodeId(sid),                          //关注项目的来源信息id
+			"fid":         qutil.If(fid == "", "", util.EncodeId(fid)), //关注项目的来源信息id
+			"remind":      0,                                           //是否开启提醒
+			"bidopentime": nil,                                         //开标时间
+			"remindtime":  nil,                                         //提醒时间
 		}
 	} else { //已关注
 		if followInfo["bidopentime"] == nil && projectInfo["bidopentime"] != nil {