From 30d0c8a43828f35c3ab8c759d9c12e989134821d Mon Sep 17 00:00:00 2001
From: xiaochanghai <xiaochanghai@foxmail.com>
Date: Thu, 26 Sep 2024 18:07:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Tiobon.Core.Services/CommonServices.cs                  | 4 +---
 Tiobon.Core.Services/Ghre/Ghre_RequestServices.cs       | 2 +-
 Tiobon.Core.Services/Ghre/Ghre_TeacherChangeServices.cs | 4 ++--
 Tiobon.Core.Services/Ghre/Ghre_TeacherServices.cs       | 2 +-
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/Tiobon.Core.Services/CommonServices.cs b/Tiobon.Core.Services/CommonServices.cs
index 65b4eeea..d5a7847e 100644
--- a/Tiobon.Core.Services/CommonServices.cs
+++ b/Tiobon.Core.Services/CommonServices.cs
@@ -2355,8 +2355,6 @@ public partial class CommonServices : BaseServices<RootEntityTkey<int>>, ICommon
     {
         var @InitmenuName = param.menuName;
         int @FlowID = 0;
-        int @NeedOPLog = 1;
-        long @OperateLogID = 0;
 
         #region 写入日志
         var sql = $@"DECLARE @return_value int;
@@ -2402,7 +2400,7 @@ public partial class CommonServices : BaseServices<RootEntityTkey<int>>, ICommon
                         dict.RequestNo = await GenerateContinuousSequence("Ghre_Request", "RequestNo", "R");
                         var id = await Db.Insertable(dict).ExecuteReturnSnowflakeIdAsync();
 
-                        sql = $"SELECT MAX(id)+1 FROM Ghre_Request WHERE Id !='{id}'";
+                        sql = $"SELECT ISNULL(MAX(id)+1,1) FROM Ghre_Request WHERE Id !='{id}'";
                         var id1 = await Db.Ado.GetLongAsync(sql);
                         sql = $"UPDATE Ghre_Request SET Id={id1} WHERE  Id ='{id}'";
                         await Db.Ado.ExecuteCommandAsync(sql);
diff --git a/Tiobon.Core.Services/Ghre/Ghre_RequestServices.cs b/Tiobon.Core.Services/Ghre/Ghre_RequestServices.cs
index ec2eaf98..55bf5420 100644
--- a/Tiobon.Core.Services/Ghre/Ghre_RequestServices.cs
+++ b/Tiobon.Core.Services/Ghre/Ghre_RequestServices.cs
@@ -108,7 +108,7 @@ FROM Ghre_Request A
 
         var id = await base.Add(entity);
 
-        var sql = $"SELECT MAX(id)+1 FROM Ghre_Request WHERE Id !='{id}'";
+        var sql = $"SELECT ISNULL(MAX(id)+1,1) FROM Ghre_Request WHERE Id !='{id}'";
         var id1 = await Db.Ado.GetLongAsync(sql);
         sql = $"UPDATE Ghre_Request SET Id={id1} WHERE  Id ='{id}'";
         await Db.Ado.ExecuteCommandAsync(sql);
diff --git a/Tiobon.Core.Services/Ghre/Ghre_TeacherChangeServices.cs b/Tiobon.Core.Services/Ghre/Ghre_TeacherChangeServices.cs
index 37d8c76c..a06bedf6 100644
--- a/Tiobon.Core.Services/Ghre/Ghre_TeacherChangeServices.cs
+++ b/Tiobon.Core.Services/Ghre/Ghre_TeacherChangeServices.cs
@@ -81,9 +81,9 @@ public class Ghre_TeacherChangeServices : BaseServices<Ghre_TeacherChange, Ghre_
         }
 
         var id = await base.Add(entity);
-        var sql = $"SELECT MAX(id)+1 FROM Ghre_Teacher WHERE Id !='{id}'";
+        var sql = $"SELECT ISNULL(MAX(id)+1,1) FROM Ghre_TeacherChange WHERE Id !='{id}'";
         var id1 = await Db.Ado.GetLongAsync(sql);
-        sql = $"UPDATE Ghre_Teacher SET Id={id1} WHERE  Id ='{id}'";
+        sql = $"UPDATE Ghre_TeacherChange SET Id={id1} WHERE  Id ='{id}'";
         await Db.Ado.ExecuteCommandAsync(sql);
         id = id1;
 
diff --git a/Tiobon.Core.Services/Ghre/Ghre_TeacherServices.cs b/Tiobon.Core.Services/Ghre/Ghre_TeacherServices.cs
index 9264c3b0..1d44aff7 100644
--- a/Tiobon.Core.Services/Ghre/Ghre_TeacherServices.cs
+++ b/Tiobon.Core.Services/Ghre/Ghre_TeacherServices.cs
@@ -211,7 +211,7 @@ FROM (SELECT A.*,
         }
 
         var id = await base.Add(entity);
-        var sql = $"SELECT MAX(id)+1 FROM Ghre_Teacher WHERE Id !='{id}'";
+        var sql = $"SELECT ISNULL(MAX(id)+1,1) FROM Ghre_Teacher WHERE Id !='{id}'";
         var id1 = await Db.Ado.GetLongAsync(sql);
         sql = $"UPDATE Ghre_Teacher SET Id={id1} WHERE  Id ='{id}'";
         await Db.Ado.ExecuteCommandAsync(sql);