diff --git a/server/adminserver/api/v1/system/mail.go b/server/adminserver/api/v1/system/mail.go
index 4624e129..7b2c87e6 100644
--- a/server/adminserver/api/v1/system/mail.go
+++ b/server/adminserver/api/v1/system/mail.go
@@ -139,7 +139,11 @@ func (this *MailApi) AddMail(c *gin.Context) {
 		return
 	}
 
-	if reqJson.MailType == jccommon.MAIL_TYPE_GROUP && !this.CheckRecipients(&reqJson.Recipients, c) {
+	if reqJson.MailType == jccommon.MAIL_TYPE_ALL {
+		if len(reqJson.Recipients) > 0 {
+			return
+		}
+	} else if reqJson.MailType == jccommon.MAIL_TYPE_GROUP && !this.CheckRecipients(&reqJson.Recipients, c) {
 		return
 	}
 
@@ -215,25 +219,21 @@ func (this *MailApi) EditMail(c *gin.Context) {
 		})
 		return
 	}
-	if reqJson.MailType <= jccommon.MAIL_TYPE_BEGIN || reqJson.MailType >= jccommon.MAIL_TYPE_END {
-		c.JSON(http.StatusOK, gin.H{
-			"code":    2,
-			"message": "mail_type参数错误",
-		})
-		return
-	}
 
 	if !this.CheckAttachment(reqJson.Attachments, c) {
 		return
 	}
-
-	if reqJson.MailType == jccommon.MAIL_TYPE_GROUP && !this.CheckRecipients(&reqJson.Recipients, c) {
-		return
-	}
+	// if reqJson.MailType <= jccommon.MAIL_TYPE_BEGIN || reqJson.MailType >= jccommon.MAIL_TYPE_END {
+	// 	c.JSON(http.StatusOK, gin.H{
+	// 		"code":    2,
+	// 		"message": "mail_type参数错误",
+	// 	})
+	// 	return
+	// }
 
 	var count int64 = 0
 	mail := new(system.Mail)
-	if f5.GetApp().GetOrmDb(constant.MAIL_DB).Table("t_mail").Take(mail, "mail_id = ?", reqJson.MailId).Count(&count); count < 1 {
+	if f5.GetApp().GetOrmDb(constant.MAIL_DB).Table(mail.TableName()).Take(mail, "mail_id = ?", reqJson.MailId).Count(&count); count < 1 {
 		c.JSON(http.StatusOK, gin.H{
 			"code":    2,
 			"message": "mailid不存在",
@@ -241,9 +241,17 @@ func (this *MailApi) EditMail(c *gin.Context) {
 		return
 	}
 
+	if mail.MailType == jccommon.MAIL_TYPE_ALL {
+		if len(reqJson.Recipients) > 0 {
+			return
+		}
+	} else if mail.MailType == jccommon.MAIL_TYPE_GROUP && !this.CheckRecipients(&reqJson.Recipients, c) {
+		return
+	}
+
 	nowDaySeconds := int32(f5.GetApp().GetRealSeconds())
 	mail.MailId = reqJson.MailId
-	mail.MailType = reqJson.MailType
+	// mail.MailType = reqJson.MailType
 	mail.SendTime = reqJson.SendTime
 	mail.ExpireTime = reqJson.ExpireTime
 	mail.UserRegStartTime = reqJson.UserRegStartTime