From 492b80b59b7676af3d58c026a7c418a743667b8c Mon Sep 17 00:00:00 2001
From: sunkaixuan <610262374@qq.com>
Date: Tue, 5 Sep 2023 18:01:37 +0800
Subject: [PATCH] Synchronization code

---
 ...thodCallExpressionResolve_BaseDateFomat.cs | 40 +++++++++++--------
 1 file changed, 24 insertions(+), 16 deletions(-)

diff --git a/Src/Asp.Net/SqlSugar/ExpressionsToSql/ResolveItems/MethodCallExpressionResolve_BaseDateFomat.cs b/Src/Asp.Net/SqlSugar/ExpressionsToSql/ResolveItems/MethodCallExpressionResolve_BaseDateFomat.cs
index 47f1c1080..3100e4253 100644
--- a/Src/Asp.Net/SqlSugar/ExpressionsToSql/ResolveItems/MethodCallExpressionResolve_BaseDateFomat.cs
+++ b/Src/Asp.Net/SqlSugar/ExpressionsToSql/ResolveItems/MethodCallExpressionResolve_BaseDateFomat.cs
@@ -16,27 +16,35 @@ namespace SqlSugar
         {
             if (IsOracle() && formatString == "yyyy-MM-dd HH:mm:ss")
             {
-                return $"to_char({value},'yyyy-MM-dd HH:mi:ss') ";
+                return $"to_char({value},'yyyy-MM-dd HH24:mi:ss') ";
             }
             else if (IsOracle() || IsPg())
             {
-                formatString = formatString.Replace("HH", "hh24");
-                if (formatString.HasValue() && formatString.Contains("hh:mm"))
+                if (!(formatString?.Contains("24") == true))
                 {
-                    formatString = formatString.Replace("hh:mm", "hh:mi");
-                }
-                else if (formatString.HasValue() && formatString.Contains("hhmm"))
-                {
-                    formatString = formatString.Replace("hhmm", "hhmi");
-                }
-                else if (formatString.HasValue() && formatString.Contains("HH:mm"))
-                {
-                    formatString = formatString.Replace("HH:mm", "HH:mi");
-                }
-                else if (formatString.HasValue() && formatString.Contains("HHmm"))
-                {
-                    formatString = formatString.Replace("HHmm", "HHmi");
+                    formatString = formatString.Replace("HH", "hh24");
+                    if (!(formatString?.Contains("24") == true))
+                    {
+                        formatString = formatString.Replace("hh", "hh24");
+                    }
                 }
+                formatString = formatString.Replace("mm", "mi");
+                //if (formatString.HasValue() && formatString.Contains("hh:mm"))
+                //{
+                //    formatString = formatString.Replace("hh:mm", "hh:mi");
+                //}
+                //else if (formatString.HasValue() && formatString.Contains("hhmm"))
+                //{
+                //    formatString = formatString.Replace("hhmm", "hhmi");
+                //}
+                //else if (formatString.HasValue() && formatString.Contains("HH:mm"))
+                //{
+                //    formatString = formatString.Replace("HH:mm", "HH:mi");
+                //}
+                //else if (formatString.HasValue() && formatString.Contains("HHmm"))
+                //{
+                //    formatString = formatString.Replace("HHmm", "HHmi");
+                //}
                 return $"to_char({value},'{formatString}') ";
             }
             else if (IsSqlite() && formatString == "yyyy-MM-dd")