Browse Source

fix: 优化接口内权限校验

hsun 2 years ago
parent
commit
b94cb89bc3
2 changed files with 16 additions and 17 deletions
  1. 2 2
      models/response/community.go
  2. 14 15
      services/community/question.go

+ 2 - 2
models/response/community.go

@@ -17,8 +17,8 @@ type CommunityQuestionItem struct {
 	ReplyTime               string                        `json:"reply_time"`
 	IsTop                   int                           `json:"is_top"`
 	ReplyStatus             int                           `json:"reply_status" description:"回复状态 1-待分配 2-待回答 3-已回答"`
-	AuthOk                  bool                          `json:"auth_ok" description:"是否有权限"`
-	PermissionInfo          PermissionCheckInfo           `json:"permission_info"`
+	//AuthOk                  bool                          `json:"auth_ok" description:"是否有权限"`
+	//PermissionInfo          PermissionCheckInfo           `json:"permission_info"`
 	AudioList               []*CommunityQuestionAudioItem `json:"audio_list"`
 }
 

+ 14 - 15
services/community/question.go

@@ -9,7 +9,6 @@ import (
 	"hongze/hongze_yb/models/tables/user_record"
 	"hongze/hongze_yb/models/tables/yb_community_question"
 	"hongze/hongze_yb/models/tables/yb_community_question_audio"
-	"hongze/hongze_yb/services/company"
 	"hongze/hongze_yb/services/user"
 	"hongze/hongze_yb/services/wechat"
 	"hongze/hongze_yb/utils"
@@ -76,11 +75,11 @@ func GetQuestionList(pageIndex, pageSize, onlyMine, chartPermissionId, replyStat
 		return
 	}
 	// 用户权限
-	authOk, permissionInfo, _, e := company.CheckBaseFiccPermission(userInfo.CompanyID, int(userInfo.UserID))
-	if e != nil {
-		err = errors.New("获取用户权限失败 Err:" + e.Error())
-		return
-	}
+	//authOk, permissionInfo, _, e := company.CheckBaseFiccPermission(userInfo.CompanyID, int(userInfo.UserID))
+	//if e != nil {
+	//	err = errors.New("获取用户权限失败 Err:" + e.Error())
+	//	return
+	//}
 
 	userId := int(userInfo.UserID)
 	resp = make([]*response.CommunityQuestionItem, 0)
@@ -118,8 +117,8 @@ func GetQuestionList(pageIndex, pageSize, onlyMine, chartPermissionId, replyStat
 			ReplyStatus:             v.ReplyStatus,
 			CreateTime:              v.CreateTime.Format(utils.FormatDateTime),
 			ReplyTime:               v.ReplyTime.Format(utils.FormatDateTime),
-			AuthOk:                  authOk,
-			PermissionInfo:          permissionInfo,
+			//AuthOk:                  authOk,
+			//PermissionInfo:          permissionInfo,
 			AudioList:               audios,
 		}
 		if !isResearcher && item.IsRead == 0 && item.UserId == userId {
@@ -158,11 +157,11 @@ func GetQuestionDetail(questionId int, userInfo user.UserInfo) (item *response.C
 	}
 	replierRank := fmt.Sprintf("弘则%s研究员", detail.ResearchGroupFirstName)
 	// 用户权限
-	authOk, permissionInfo, _, e := company.CheckBaseFiccPermission(userInfo.CompanyID, int(userInfo.UserID))
-	if e != nil {
-		err = errors.New("获取用户权限失败 Err:" + e.Error())
-		return
-	}
+	//authOk, permissionInfo, _, e := company.CheckBaseFiccPermission(userInfo.CompanyID, int(userInfo.UserID))
+	//if e != nil {
+	//	err = errors.New("获取用户权限失败 Err:" + e.Error())
+	//	return
+	//}
 	avatar := detail.ReplierAvatar
 	if avatar == "" {
 		avatar = utils.HZ_DEFAULT_AVATAR
@@ -183,8 +182,8 @@ func GetQuestionDetail(questionId int, userInfo user.UserInfo) (item *response.C
 		ReplyStatus:             detail.ReplyStatus,
 		CreateTime:              detail.CreateTime.Format(utils.FormatDateTime),
 		ReplyTime:               detail.ReplyTime.Format(utils.FormatDateTime),
-		AuthOk:                  authOk,
-		PermissionInfo:          permissionInfo,
+		//AuthOk:                  authOk,
+		//PermissionInfo:          permissionInfo,
 		AudioList:               audios,
 	}
 	errMsg = "获取成功"