From 085333983896d0f39f4dd3f6e84c7cf3f17661a5 Mon Sep 17 00:00:00 2001
From: gaoqr <13665037151@163.com>
Date: Thu, 28 May 2026 18:51:59 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=8A=A5=E8=A1=A8=E5=A4=8D=E5=88=B6?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8=E4=BF=AE=E5=A4=8D=EF=BC=9B2=E3=80=81?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E6=8A=A5=E8=A1=A8=E6=A8=A1=E6=9D=BF=E8=AF=B7?=
 =?UTF-8?q?=E6=B1=82=E7=BB=84=E7=BB=87id=E5=BD=92=E5=B1=9E=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../report/service/template/ReportTemplateServiceImpl.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/service/template/ReportTemplateServiceImpl.java b/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/service/template/ReportTemplateServiceImpl.java
index e5b897cb2..6c82bf9cd 100644
--- a/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/service/template/ReportTemplateServiceImpl.java
+++ b/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/service/template/ReportTemplateServiceImpl.java
@@ -175,7 +175,7 @@ public class ReportTemplateServiceImpl implements ReportTemplateService {
         // 超管/管理端操作的就是公共模版
         boolean isPublic = (isSuperAdmin || manageEndPoint) && ObjectUtil.isNull(targetOrganId);
 
-        Long organId = isPublic ? loginOrganId : targetOrganId;
+        Long organId = ObjectUtil.defaultIfNull(targetOrganId, loginOrganId);
 
         Long templateId = createReqVO.getId();
         // 校验存在
@@ -204,6 +204,7 @@ public class ReportTemplateServiceImpl implements ReportTemplateService {
             copyTemplateDO.setType(ReportTemplateTypeEnum.SYSTEM);
         } else {
             // 重置所属机构
+            copyTemplateDO.setOrganId(organId);
             copyTemplateDO.setType(ReportTemplateTypeEnum.CUSTOM);
         }
         templateMapper.insert(copyTemplateDO);
@@ -220,7 +221,7 @@ public class ReportTemplateServiceImpl implements ReportTemplateService {
         // 超管/管理端操作的就是公共模版
         boolean isPublic = (isSuperAdmin || manageEndPoint) && ObjectUtil.isNull(targetOrganId);
 
-        Long organId = isPublic ? loginOrganId : targetOrganId;
+        Long organId = ObjectUtil.defaultIfNull(targetOrganId, loginOrganId);
 
         Long templateId = updateReqVO.getId();
         // 校验存在
@@ -801,7 +802,7 @@ public class ReportTemplateServiceImpl implements ReportTemplateService {
         // 超管/管理端操作的就是公共模版
         boolean isPublic = (isSuperAdmin || manageEndPoint) && ObjectUtil.isNull(targetOrganId);
 
-        Long organId = isPublic ? loginOrganId : targetOrganId;
+        Long organId = ObjectUtil.defaultIfNull(targetOrganId, loginOrganId);
 
         try {
             // 读取文件json