diff --git a/cf-module-report/cf-module-report-api/src/main/java/com/cf/imes/module/report/enums/ErrorCodeConstants.java b/cf-module-report/cf-module-report-api/src/main/java/com/cf/imes/module/report/enums/ErrorCodeConstants.java
index 8179c7e81..030bcf8a8 100644
--- a/cf-module-report/cf-module-report-api/src/main/java/com/cf/imes/module/report/enums/ErrorCodeConstants.java
+++ b/cf-module-report/cf-module-report-api/src/main/java/com/cf/imes/module/report/enums/ErrorCodeConstants.java
@@ -12,7 +12,6 @@ public final class ErrorCodeConstants {
 
     // ========== UREPORT template模块 1-003-001-000 ==========
     public static ErrorCode TEMPLATE_NOT_EXISTS = new ErrorCode(1_003_001_001, "报表模板信息不存在");
-    public static ErrorCode TEMPLATE_GENERATE_EXCEL_ERROR = new ErrorCode(1_003_001_002, "模板excel生成异常");
 
     // ========== UREPORT datasource模块 1-003-002-000 ==========
     public static ErrorCode DATASOURCE_NOT_EXISTS = new ErrorCode(1_003_002_001, "报表数据源不存在");
diff --git a/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/dal/dataobject/dataset/ReportDatasetDO.java b/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/dal/dataobject/dataset/ReportDatasetDO.java
index 3f1cade56..082c6408b 100644
--- a/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/dal/dataobject/dataset/ReportDatasetDO.java
+++ b/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/dal/dataobject/dataset/ReportDatasetDO.java
@@ -62,6 +62,14 @@ public class ReportDatasetDO extends BaseDO {
     @TableField(typeHandler = CompressObjectListTypeHandler.class)
     private List<ReportDatasetParameterVO> parameters;
 
+    /**
+     * 字段列表
+     */
     @TableField(typeHandler = CompressObjectListTypeHandler.class)
     private List<ReportDatasetFieldVO> fields;
+
+    /**
+     * 组织id
+     */
+    private Long organId;
 }
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 bdc1a9184..442db1210 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
@@ -38,7 +38,6 @@ import com.cf.imes.module.report.dal.dataobject.dataset.ReportDatasetDO;
 import com.cf.imes.module.report.dal.dataobject.datasource.ReportDatasourceDO;
 import com.cf.imes.module.report.dal.dataobject.template.ReportTemplateDO;
 import com.cf.imes.module.report.dal.mysql.template.ReportTemplateMapper;
-import com.cf.imes.module.report.enums.ErrorCodeConstants;
 import com.cf.imes.module.report.service.dataset.ReportDatasetService;
 import com.cf.imes.module.report.service.datasource.ReportDatasourceService;
 import org.apache.commons.lang3.StringUtils;
@@ -54,6 +53,7 @@ import java.util.List;
 import java.util.Map;
 
 import static com.cf.imes.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static com.cf.imes.module.report.enums.ErrorCodeConstants.TEMPLATE_NOT_EXISTS;
 
 /**
  * 报表模板信息 Service 实现类
@@ -165,12 +165,14 @@ public class ReportTemplateServiceImpl implements ReportTemplateService {
      */
     private void validateTemplateExists(Long id) {
         if (templateMapper.selectById(id) == null) {
-            throw exception(ErrorCodeConstants.TEMPLATE_NOT_EXISTS);
+            throw exception(TEMPLATE_NOT_EXISTS);
         }
     }
 
     @Override
     public ReportTemplateDO getReportTemplate(Long id) {
+        // 校验模板
+        validateTemplateExists(id);
         // 查询模板
         ReportTemplateDO template = templateMapper.selectById(id);
         if (ObjectUtil.isNotNull(template)) {
@@ -188,6 +190,8 @@ public class ReportTemplateServiceImpl implements ReportTemplateService {
 
     @Override
     public ReportDefinitionWrapper getReportTemplateDefinition(Long id) {
+        // 校验模板
+        validateTemplateExists(id);
         // 查询模板
         ReportTemplateDO template = templateMapper.selectById(id);
         String xmlContent = template.getContent();
@@ -292,8 +296,11 @@ public class ReportTemplateServiceImpl implements ReportTemplateService {
 
     @Override
     public Report generateReport(ReportTemplateGenerateReqDTO reqDTO) {
+        Long templateId = reqDTO.getTemplateId();
+        // 校验模板
+        validateTemplateExists(templateId);
         // 查询模板
-        ReportTemplateDO template = templateMapper.selectById(reqDTO.getTemplateId());
+        ReportTemplateDO template = templateMapper.selectById(templateId);
         String xmlContent = template.getContent();
         ReportRender reportRender = new ReportRender();
         // 解析xml