From 961d8a462d209885ddb4efbb72d23e25771ef2c3 Mon Sep 17 00:00:00 2001
From: zhou-hongcheng <1064771933@qq.com>
Date: Thu, 26 Feb 2026 17:38:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=89=A9=E6=96=99=E6=97=B6?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8=E4=BC=A0=E5=85=A5=E7=9A=84=E7=BB=84=E7=BB=87?=
 =?UTF-8?q?=E8=A1=A8ID?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../materialBaseInfo/MaterialBaseInfoAssembler.java      | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/assember/materialBaseInfo/MaterialBaseInfoAssembler.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/assember/materialBaseInfo/MaterialBaseInfoAssembler.java
index 660ac488f..eaf39d02e 100644
--- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/assember/materialBaseInfo/MaterialBaseInfoAssembler.java
+++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/assember/materialBaseInfo/MaterialBaseInfoAssembler.java
@@ -52,8 +52,13 @@ public class MaterialBaseInfoAssembler {
             materialBaseInfoDO.setUpdateByName(userName);
             materialBaseInfoDO.setUpdateTime(new Date());
         }else {
-            materialBaseInfoDO.setOrganizationId(loginUser.getUserPo().getOrganizationId());
-            materialBaseInfoDO.setOrganizationName(loginUser.getUserPo().getOrganizationName());
+            if (materialBaseInfoDTO.getOrganizationId() != null) {
+                materialBaseInfoDO.setOrganizationId(materialBaseInfoDTO.getOrganizationId());
+                materialBaseInfoDO.setOrganizationName(materialBaseInfoDTO.getOrganizationName());
+            }else{
+                materialBaseInfoDO.setOrganizationId(loginUser.getUserPo().getOrganizationId());
+                materialBaseInfoDO.setOrganizationName(loginUser.getUserPo().getOrganizationName());
+            }
             materialBaseInfoDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
             materialBaseInfoDO.setCreateBy(userId);
             materialBaseInfoDO.setCreateByName(userName);