fix 消息列表页的普通文字消息也要展示对应的消息类型

controllers/message.go

@@ -145,9 +145,7 @@ func (this *MessageCommon) MessageList() {
 			companyApprovalIds = append(companyApprovalIds, strconv.Itoa(messageInfo.CompanyApprovalId))
 		} else {
 			//如果不是文字消息
-			if messageInfo.MessageType != 3 {
-				newApprovalRecordIds = append(newApprovalRecordIds, strconv.Itoa(messageInfo.CompanyApprovalId))
-			}
+			newApprovalRecordIds = append(newApprovalRecordIds, strconv.Itoa(messageInfo.CompanyApprovalId))
 		}
 	}
 	//客户信息
@@ -219,13 +217,11 @@ func (this *MessageCommon) MessageList() {
 				approvalInfo.ApprovalTime = companyApproval.ApproveTime
 			}
 		} else {
-			if messageInfo.MessageType != 3 {
-				if newApproval, ok := newApprovalMap[messageInfo.CompanyApprovalId]; ok {
-					approvalInfo.Type = newApproval.ApplyContent
-					approvalInfo.ApplyName = newApproval.ApplyUserName
-					approvalInfo.ApplyTime = newApproval.CreateTime
-					approvalInfo.ApprovalTime = newApproval.ModifyTime
-				}
+			if newApproval, ok := newApprovalMap[messageInfo.CompanyApprovalId]; ok {
+				approvalInfo.Type = newApproval.ApplyContent
+				approvalInfo.ApplyName = newApproval.ApplyUserName
+				approvalInfo.ApplyTime = newApproval.CreateTime
+				approvalInfo.ApprovalTime = newApproval.ModifyTime
 			}
 		}
 		messageInfo.ApprovalInfo = approvalInfo

services/admin.go

@@ -2,6 +2,7 @@ package services
 
 import (
 	"errors"
+	"fmt"
 	"hongze/hongze_mobile_admin/models/custom"
 	"hongze/hongze_mobile_admin/models/tables/admin"
 	"hongze/hongze_mobile_admin/models/tables/admin_record"
@@ -163,7 +164,7 @@ func BindWxUser(openid, userName, password string, registerPlatform int) (adminW
 	//如果查询出来的用户是nil，那么需要新增用户
 	//如果存在该手机号/邮箱，那么需要校验
 	if adminRecord.UserId > 0 && adminRecord.UserId != adminInfo.AdminId {
-		err = errors.New("用户已绑定，不允许重复绑定")
+		err = errors.New(fmt.Sprint("用户已绑定，不允许重复绑定:", adminRecord.UserId))
 		return
 	}
 	if adminRecord.UserId == 0 {