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);