Merge branch 'dev/v1.2.6_zxl' of SocialPlatform/messageCenter into feature/v1.2.6

api/messagecenter/internal/logic/messageaddlogic.go

@@ -53,13 +53,19 @@ func (l *MessageAddLogic) MessageAdd(req *types.MessageEntity) (*types.CommonRes
 	if req.SendId == "" {
 		sendId = req.PositionId
 	}
+	typ := func(typ int64) int64 {
+		if typ == 5 || typ == 6 {
+			return 1
+		}
+		return typ
+	}(req.Type)
 	resp, err := l.svcCtx.Message.SaveMessage(l.ctx, &messagecenter.MessageEntity{
 		OwnType:     req.OwnType,
 		Title:       req.Title,
 		SendId:      sendId,
 		Content:     quitl.ObjToString(quitl.If(req.Type == 3 || req.Type == 4 || req.Type == 5, fsw.Repl(req.Content), htmlFilter.Sanitize(fsw.Repl(req.Content)))),
 		Item:        req.Item,
-		Type:        quitl.Int64All(quitl.If(req.Type == 5, 1, req.Type)),
+		Type:        typ,
 		Link:        req.Link,
 		Appid:       req.Appid,
 		ItemType:    req.ItemType,

service/message_mail_box.go

@@ -1032,13 +1032,13 @@ func (this *MessaggeService) Chat(in *messagecenter.MessageEntity) (fool bool, e
 			for _, v := range in.GroupIds {
 				args := []interface{}{}
 				groupUser := GetUserByGroupId(tx, v, in.SendId)
+				//发送人自己
+				if !isWithdrawByOthers {
+					args = append(args, in.Appid, messageId, in.ItemType, in.SendId, 2, in.SendId, 2, 2, in.SendId, nowTime, v, 1)
+					//最后一次聊天
+					SocializeSummaryAddOrUpdate(tx, v, in.SendId, 0, messageId, isCustomerServiceAccess, nowTime)
+				}
 				for _, vv := range groupUser {
-					//发送人自己
-					if !isWithdrawByOthers {
-						args = append(args, in.Appid, messageId, in.ItemType, in.SendId, 2, vv, 2, 2, in.SendId, nowTime, v, 1)
-						//最后一次聊天
-						SocializeSummaryAddOrUpdate(tx, v, in.SendId, 0, messageId, isCustomerServiceAccess, nowTime)
-					}
 					if !isWithdrawByMyself {
 						log.Println("获取到群组下员工:", vv)
 						//接收人其他用户