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