非管理员用户允许修复昵称

server/controllers/email/send.go

@@ -65,21 +65,21 @@ func Send(ctx *context.Context, w http.ResponseWriter, req *http.Request) {
 		return
 	}
 
-	if !ctx.IsAdmin && reqData.From.Name != ctx.UserAccount {
-		response.NewErrorResponse(response.ParamsError, "params error", "").FPrint(w)
-		return
-	}
-
 	if reqData.From.Email != "" {
 		infos := strings.Split(reqData.From.Email, "@")
 		if len(infos) != 2 || !array.InArray(infos[1], config.Instance.Domains) {
 			response.NewErrorResponse(response.ParamsError, "params error", "").FPrint(w)
 			return
 		}
+		if !ctx.IsAdmin && infos[0] != ctx.UserAccount {
+			response.NewErrorResponse(response.ParamsError, "params error", "").FPrint(w)
+			return
+		}
+
 	}
 
-	if reqData.From.Email == "" && reqData.From.Name != "" {
-		reqData.From.Email = reqData.From.Name + "@" + config.Instance.Domain
+	if reqData.From.Email == "" {
+		reqData.From.Email = ctx.UserAccount + "@" + config.Instance.Domain
 	}
 
 	if reqData.From.Email == "" {