Merge branch 'yb/5.2' into debug

controllers/yb/community_question_comment.go

@@ -23,14 +23,14 @@ type CommunityQuestionCommentController struct {
 // @Success 200 {object} yb.CommunityQuestionCommentListResp
 // @router /community/question/comment/list [get]
 func (c *CommunityQuestionCommentController) List() {
-	sysUser := c.AdminWx
+	//sysUser := c.AdminWx
 
 	// 权限校验
-	msg, err := yb.CheckCommunityQuestionPermission(sysUser.AdminId)
-	if err != nil {
-		c.FailWithMessage(msg, err.Error())
-		return
-	}
+	//msg, err := yb.CheckCommunityQuestionPermission(sysUser.AdminId)
+	//if err != nil {
+	//	c.FailWithMessage(msg, err.Error())
+	//	return
+	//}
 
 	condition := ""
 	pars := make([]interface{}, 0)
@@ -85,13 +85,13 @@ func (c *CommunityQuestionCommentController) List() {
 // @Success 200 string "操作成功"
 // @router /community/question/comment/delete [post]
 func (c *CommunityQuestionCommentController) Delete() {
-	sysUser := c.AdminWx
+	//sysUser := c.AdminWx
 	// 权限校验
-	msg, err := yb.CheckCommunityQuestionPermission(sysUser.AdminId)
-	if err != nil {
-		c.FailWithMessage(msg, err.Error())
-		return
-	}
+	//msg, err := yb.CheckCommunityQuestionPermission(sysUser.AdminId)
+	//if err != nil {
+	//	c.FailWithMessage(msg, err.Error())
+	//	return
+	//}
 
 	var req ybRequest.QuestionCommentDeleteReq
 	if err := json.Unmarshal(c.Ctx.Input.RequestBody, &req); err != nil {
@@ -111,13 +111,13 @@ func (c *CommunityQuestionCommentController) Delete() {
 // @Success 200 string "操作成功"
 // @router /community/question/comment/hot [post]
 func (c *CommunityQuestionCommentController) Hot() {
-	sysUser := c.AdminWx
+	//sysUser := c.AdminWx
 	// 权限校验
-	msg, err := yb.CheckCommunityQuestionPermission(sysUser.AdminId)
-	if err != nil {
-		c.FailWithMessage(msg, err.Error())
-		return
-	}
+	//msg, err := yb.CheckCommunityQuestionPermission(sysUser.AdminId)
+	//if err != nil {
+	//	c.FailWithMessage(msg, err.Error())
+	//	return
+	//}
 
 	var req ybRequest.QuestionCommentHotReq
 	if err := json.Unmarshal(c.Ctx.Input.RequestBody, &req); err != nil {

services/variety_tag.go

@@ -87,11 +87,11 @@ func GetTagTree(include int) (respList []*TagTreeItem, err error) {
 				})
 			}
 		}
-		// 价格驱动
-		priceState := priceTagMap[item.VarietyTagId]
 
 		//有数据才push进去
 		if len(members) > 0 {
+			// 价格驱动
+			priceState := priceTagMap[item.VarietyTagId]
 			tagsArr = append(tagsArr, &TagItem{
 				TagId:             item.VarietyTagId,
 				TagName:           item.TagName,