Merge branch 'mfyx_3.4' of http://8.136.199.33:3000/cxzhang/hongze_mfyx into debug

controllers/yanxuan_special_message.go

@@ -100,7 +100,7 @@ func (this *YanxuanSpecialMessageController) MessageAdd() {
 // @Param   PageSize   query   int  true       "每页数据条数"
 // @Param   CurrentIndex   query   int  true       "当前页页码，从1开始"
 // @Param   MessageType   query   int  false       "留言类型1：普通留言、2：公开留言"
-// @Param   MessageId   query   int  false       "留言ID"
+// @Param   WxMessageId   query   int  false       "留言ID"
 // @Success 200 {object} models.SpecialListResp
 // @router /message/manage/list [get]
 func (this *YanxuanSpecialMessageController) MessageManageList() {
@@ -120,16 +120,18 @@ func (this *YanxuanSpecialMessageController) MessageManageList() {
 	pageSize, _ := this.GetInt("PageSize")
 	currentIndex, _ := this.GetInt("CurrentIndex")
 	messageType, _ := this.GetInt("MessageType", 1)
-	messageId, _ := this.GetInt("MessageId")
+	messageId, _ := this.GetInt("WxMessageId") // 前端做区分
-	messagerDetail, err := models.GetCygxYanxuanSpecialMessagerDetailById(messageId)
-	if err != nil {
-		br.Msg = "获取失败"
-		br.ErrMsg = "获取失败, Err:" + err.Error()
-		return
-	}
 	resp := new(models.YanxuanSpecialMessageManageRespListResp)
-	if messagerDetail.Status == -1 {
+	if messageId > 0 {
-		resp.IsDelete = true
+		messagerDetail, err := models.GetCygxYanxuanSpecialMessagerDetailById(messageId)
+		if err != nil {
+			br.Msg = "获取失败"
+			br.ErrMsg = "获取失败, Err:" + err.Error()
+			return
+		}
+		if messagerDetail.Status == -1 {
+			resp.IsDelete = true
+		}
 	}
 	var startSize int
 	if pageSize <= 0 {

utils/constants.go

@@ -206,15 +206,15 @@ const (
 	WX_MSG_PATH_YX_SURVEY_DETAIL         = "pages-purchaser/survey/surveyDetail?surveyId="                //用户提交研选调研需求
 	WX_MSG_PATH_APPLY_COLLECTION_DETAIL  = "reportPages/bulletinDetail/bulletinDetail?id="                //精选看板申请详情页
 
-	WX_MSG_PATH_YX_SPECIAL_DETAIL              = "pages-purchaser/noteAndViewpoint/noteAndViewpoint?id="       //研选专栏详情
+	WX_MSG_PATH_YX_SPECIAL_DETAIL              = "pages-purchaser/noteAndViewpoint/noteAndViewpoint?id="            //研选专栏详情
-	WX_MSG_PATH_YX_SPECIAL_ENABLE_DETAIL       = "pages-purchaser/toExamine/toExamine?isMessage=模板&id="        //研选专栏审核详情页面
+	WX_MSG_PATH_YX_SPECIAL_ENABLE_DETAIL       = "pages-purchaser/toExamine/toExamine?isMessage=模板&id="             //研选专栏审核详情页面
-	WX_MSG_PATH_YX_SPECIAL_CENTER              = "pages-purchaser/contentAllPage/contentAllPage?Status=4"      //研选专栏内容中心
+	WX_MSG_PATH_YX_SPECIAL_CENTER              = "pages-purchaser/contentAllPage/contentAllPage?Status=4"           //研选专栏内容中心
-	WX_MSG_PATH_YX_COMMENT_DETAIL              = "pages-activity/generationAsk/generationAsk?id="              //研选报告留言详情
+	WX_MSG_PATH_YX_COMMENT_DETAIL              = "pages-activity/generationAsk/generationAsk?id="                   //研选报告留言详情
-	WX_MSG_PATH_YX_ACTIVITY_DETAIL             = "pages-activity/activityDetail/activityDetail?IsSendWx=1&id=" //研选活动详情
+	WX_MSG_PATH_YX_ACTIVITY_DETAIL             = "pages-activity/activityDetail/activityDetail?IsSendWx=1&id="      //研选活动详情
-	WX_MSG_PATH_YX_SIGNUP_DETAIL               = "pages-message/activityTemplate/activityTemplate?id="         //研选报名详情
+	WX_MSG_PATH_YX_SIGNUP_DETAIL               = "pages-message/activityTemplate/activityTemplate?id="              //研选报名详情
-	WX_MSG_PATH_YX_ARTICLE_DETAIL              = "pages-user/reportDetail/reportDetail?IsSendWx=1&id="         //研选纪要详情
+	WX_MSG_PATH_YX_ARTICLE_DETAIL              = "pages-user/reportDetail/reportDetail?IsSendWx=1&id="              //研选纪要详情
-	WX_MSG_PATH_YX_SPECIAL_MASSAGE_DETAIL      = "pages-purchaser/replyDetailsPage/replyDetailsPage?msgId="    //研选专栏留言详情
+	WX_MSG_PATH_YX_SPECIAL_MASSAGE_DETAIL      = "pages-purchaser/replyDetailsPage/replyDetailsPage?msgId="         //研选专栏留言详情
-	WX_MSG_PATH_YX_SPECIAL_MASSAGE_MANAGE_LIST = "pages-purchaser/commentManagement/commentManagement?msgId="  //研选专栏留言管理列表
+	WX_MSG_PATH_YX_SPECIAL_MASSAGE_MANAGE_LIST = "pages-purchaser/commentManagement/commentManagement?wxMessageId=" //研选专栏留言管理列表
 )
 
 //2：文章详情  https://web.hzinsights.com/material/info/8436  小程序路径：/pageMy/reportDetail/reportDetail?id=