From 18d1f45193e34e00fc1b6f65b8596ddb29c5267d Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期二, 24 十二月 2024 15:32:43 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn

---
 代码管理/WMS/WIDESEA_WMSServer/WIDESEA_Core/Utilities/ParamsValidator.cs |   26 +++++++++++++++-----------
 1 files changed, 15 insertions(+), 11 deletions(-)

diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/Utilities/ParamsValidator.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/Utilities/ParamsValidator.cs"
index 9416db9..1be56f5 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/Utilities/ParamsValidator.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/Utilities/ParamsValidator.cs"
@@ -21,22 +21,26 @@
                 foreach (var param in context.ActionDescriptor.Parameters)
                 {
                     ModelValidateAttribute? modelValidate = param.ParameterType.GetCustomAttribute<ModelValidateAttribute>();
-                    if (modelValidate != null && context.ActionArguments.TryGetValue(param.Name, out object? value))
+                    if (modelValidate != null && context.ActionArguments.TryGetValue(param.Name, out object? value) && value != null)
                     {
-                        if (value != null)
+                        (bool, string, object?) result = ModelValidate.ValidateModelData(value, param.ParameterType);
+                        if (!result.Item1)
                         {
-                            (bool, string, object?) result = ModelValidate.ValidateModelData(value, param.ParameterType);
-                            if (!result.Item1)
+                            context.Result = new JsonResult(new WebResponseContent()
                             {
-                                context.Result = new JsonResult(new WebResponseContent()
-                                {
-                                    Status = false,
-                                    Data = result.Item3,
-                                    Message = result.Item2
-                                });
-                            }
+                                Status = false,
+                                Data = result.Item3,
+                                Message = result.Item2
+                            });
                         }
                     }
+                    //else
+                    //{
+                    //    if (param.ParameterType == typeof(SaveModel) && context.ActionArguments.TryGetValue(param.Name, out value) && value != null)
+                    //    {
+
+                    //    }
+                    //}
                 }
             }
         }

--
Gitblit v1.9.3