1

Learun.Application.Web/AppApi/LoginApiController.cs

@@ -93,6 +93,8 @@ namespace Learun.Application.Web.AppApi
                     logEntity.F_ExecuteResult = 1;
                     logEntity.F_ExecuteResultJson = "登录成功";
                     logEntity.WriteLog();
+                    var X= log4net.LogManager.GetLogger("INFO");
+                    X.Info("登录成功！");
                     OperatorHelper.Instance.ClearCurrentErrorNum(); //成功了 就可以重置了
                     bool isFirstLogin = false;
                     if (userEntity.PasswordUpdateTime == null)//没有修改密码

Learun.Application.Web/Learun.Application.Web.csproj

@@ -3433,6 +3433,7 @@
     <Content Include="SQL\250307\Project\ec_archive_enginedata_3.sql" />
     <Content Include="SQL\250307\Project\ec_archive_property_3.sql" />
     <Content Include="SQL\250307\Project\ec_archive_rel_3.sql" />
+    <Content Include="SQL\250825\Project\DWG_PUBLISH.sql" />
     <Content Include="SQL\250728\Project\ec_layoutFilterP.sql" />
     <Content Include="SQL\250728\Project\ec_layoutFilter.sql" />
     <Content Include="SQL\Initial_Data.sql">
@@ -3656,6 +3657,7 @@
     <Folder Include="SQL\250307\NoProject\" />
     <Folder Include="SQL\250328\NoProject\" />
     <Folder Include="SQL\250728\NoProject\" />
+    <Folder Include="SQL\250825\NoProject\" />
     <Folder Include="Views\PlotLayout\" />
     <Folder Include="Views\Property\" />
   </ItemGroup>

Learun.Application.Web/SQL/250825/Project/DWG_PUBLISH.sql

@@ -0,0 +1,5 @@
+ALTER TABLE ec_drawing_publish ADD `FileRevision` varchar(100) NULL;
+ALTER TABLE ec_drawing_publish ADD `Seq` varchar(100) NULL;
+
+ALTER TABLE ec_drawing_syn ADD ExtractDate DATETIME NULL;
+ALTER TABLE ec_objtypelayoutfilter ADD Operator varchar(100) NULL;

Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ZZDT_EC/ec_Wire_Group/IO_WorkFlowService.cs

@@ -741,6 +741,24 @@ namespace Learun.Application.TwoDevelopment.ZZDT_EC
         public void Restore(ec_Wire_GroupEntity NewSignal, ec_Wire_GroupEntity OldSignal, string reason, bool NeedLog = true, string MODE = "0")
         {
             string id = NewSignal.Wire_Group_ID;
+            #region 如果自己是虚拟点，父节点如果是删除状态，则不能恢复
+            if (!string.IsNullOrEmpty(NewSignal.ParentID))
+            {
+                var parentSignal = SqlSugarHelper.Db.Queryable<ec_Wire_GroupEntity>().AS(SignalTableName).First(x => x.Wire_Group_ID == NewSignal.ParentID);
+                if (parentSignal== null)
+                {
+                    throw new System.Exception($"无法还原该{NewSignal.Group_Name}信号，其父信号不存在了。");
+                }
+                else
+                {
+                    if (parentSignal.DeleteFlg == true)
+                    {
+                        throw new System.Exception($"无法还原该{NewSignal.Group_Name}信号，其父信号{parentSignal.Group_Name}仍处于回收站内。");
+
+                    }
+                }
+            }
+            #endregion
             var ModifyMsg = this.CompareModifyField(ProjIndex, OldSignal, NewSignal, "Status");//信号从回收站恢复
 
             if (!string.IsNullOrEmpty(OldSignal.ChannelID) && !string.IsNullOrEmpty(ModifyMsg))

Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ZZDT_EC/ec_objecttype/ec_objecttypeBLL.cs

@@ -201,7 +201,7 @@ namespace Learun.Application.TwoDevelopment.ZZDT_EC
         public List<ec_objTypeLayoutFilter> GetLayoutFilterList(string projId, string objTypeId)
         {
             var tbName = ProjectSugar.TableName<ec_objTypeLayoutFilter>(projId);
-            var res = Db.Queryable<ec_objTypeLayoutFilter>().AS(tbName).ToList();
+            var res = Db.Queryable<ec_objTypeLayoutFilter>().AS(tbName).Where(x=>x.ObjectTypeId == objTypeId).ToList();
             var tbFileName = ProjectSugar.TableName<ec_library_fileEntity>(projId);
             var fileBll = new ec_library_fileBLL();
             var res2 = fileBll.GetList("{ProjectId:\"" + projId + "\"}").ToList();

SWSDBSchemeUpgradeTool/MainWindow.xaml.cs

@@ -328,11 +328,20 @@ WHERE
             //cmd.ExecuteNonQuery();
             SqlSugarHelper.Db.Ado.ExecuteCommand(query);
         }
-
+        /// <summary>
+        /// 增补更新。去找SQL文件夹下，每个小sql的内容
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
         private void Button_Click(object sender, RoutedEventArgs e)
         {
             if (bInitialed)
             {
+                if (!Directory.Exists(IISDirectory + "/" + "SQL"))
+                {
+                    MessageBox.Show($"IIS根目录({IISDirectory})下的SQL文件夹不存在。请检查。");
+                    return;
+                }
                 ExecuteVersionedScripts(IISDirectory + "/" + "SQL");
             }