From eb4c3856dc31cc87fde0652da4e725bc75d1f47d Mon Sep 17 00:00:00 2001
From: wyw <571921741@qq.com>
Date: Thu, 19 Mar 2026 16:37:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=9E=8D=E5=85=A5=E4=BA=BA?=
 =?UTF-8?q?=20=E4=B8=BA=E8=B6=85=E7=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Api/LRController/6LawController.cs            | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/LRController/6LawController.cs b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/LRController/6LawController.cs
index 7fe0e39..35d795d 100644
--- a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/LRController/6LawController.cs
+++ b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/LRController/6LawController.cs
@@ -529,6 +529,7 @@ namespace APT.LR.WebApi.Controllers.Api
                 T_PF_IMG_FILE modelImgFile = null;
                 T_PF_FILE modelFile = null;
 
+                Guid AdminID = new Guid("11111111-1111-1111-1111-111111111111");
                 #region      全部拆到组合中去再统一处理
 
                 foreach (var item in listSourse)
@@ -565,15 +566,15 @@ namespace APT.LR.WebApi.Controllers.Api
                     {
                         item.CREATER_ID = LoginID;
                         item.CREATE_TIME = dtNow;
-                        item.USER_ID = LoginID.Value;
                     }
-                    else
+                    else if (modelCheck != null)
                     {
                         item.NAME = modelCheck.NAME;
                         item.LAW_STATUS = modelCheck.LAW_STATUS;
                         item.UPDATE_TIME = modelCheck.UPDATE_TIME;
                         item.EXECUTE_TIME = modelCheck.EXECUTE_TIME;
                     }
+                    item.USER_ID = AdminID;//融入人修改为 超管
                     listLaw.Add(item);
                 }
 
@@ -596,7 +597,7 @@ namespace APT.LR.WebApi.Controllers.Api
                         item.CREATER_ID = LoginID;
                         item.CREATE_TIME = dtNow;
                     }
-                    else
+                    else if (modelCheckType != null)
                     {
                         item.NAME = modelCheckType.NAME;
                         item.CODE = modelCheckType.CODE;
@@ -619,7 +620,7 @@ namespace APT.LR.WebApi.Controllers.Api
                         item.CREATER_ID = LoginID;
                         item.CREATE_TIME = dtNow;
                     }
-                    else
+                    else if (modelVersion != null)
                     {
                         item.EXECUTE_TIME = modelVersion.EXECUTE_TIME;
                         item.UPDATE_TIME = modelVersion.UPDATE_TIME;
@@ -645,7 +646,7 @@ namespace APT.LR.WebApi.Controllers.Api
                         item.CREATER_ID = LoginID;
                         item.CREATE_TIME = dtNow;
                     }
-                    else
+                    else if (modelVersionFile != null)
                     {
                         item.IMG_FILE_ID = modelVersionFile.IMG_FILE_ID;
                         item.VERSION_ID = modelVersionFile.VERSION_ID;
@@ -667,7 +668,7 @@ namespace APT.LR.WebApi.Controllers.Api
                         item.CREATER_ID = LoginID;
                         item.CREATE_TIME = dtNow;
                     }
-                    else
+                    else if (modelImgFile != null)
                     {
                         item.FILE_PATH = modelImgFile.FILE_PATH;
                         item.FILE_NAME = modelImgFile.FILE_NAME;
@@ -693,7 +694,7 @@ namespace APT.LR.WebApi.Controllers.Api
                         item.CREATER_ID = LoginID;
                         item.CREATE_TIME = dtNow;
                     }
-                    else
+                    else if (modelFile != null)
                     {
                         item.FILE_PATH = modelFile.FILE_PATH;
                         item.FILE_NAME = modelFile.FILE_NAME;