Parcourir la source

Merge branch 'dev/v4.8.23.2_wh' of qmx/jy into hotfix/v4.8.23.2

王浩 il y a 2 ans
Parent
commit
16b3c7ff86
1 fichiers modifiés avec 3 ajouts et 5 suppressions
  1. 3 5
      src/jfw/modules/bigmember/src/service/follow/project.go

+ 3 - 5
src/jfw/modules/bigmember/src/service/follow/project.go

@@ -179,15 +179,13 @@ func (this *FollowProject) FollowDetail() {
 		if err != nil {
 			return nil, err
 		}
-		fid := util.DecodeId(this.GetString("fid")) //获取关注项目id
+		//fid := util.DecodeId(this.GetString("fid")) //获取关注项目id
 		sid := util.DecodeId(this.GetString("sid")) //获取信息id
-		if sid == "" && fid == "" {
+		if sid == "" {
 			return nil, errors.New("请求参数有误")
 		}
+		fid, _, _ := projectManager.FollowedCheck(sid)
 		//若前端未传fid,则根据sid查询获取fid
-		if fid == "" {
-			fid, _, _ = projectManager.FollowedCheck(sid)
-		}
 		var followData, projectInfo map[string]interface{}
 		if fid != "" { //已关注 查询详情z
 			followData, projectInfo, err = projectManager.GetDetailByFid(fid)