Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-14 13:42:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

1、报表复制异常修复；2、部分报表模板请求组织id归属修复；

Browse Source
This commit is contained in:
gaoqr
2026-05-28 18:51:59 +08:00
parent 68b29d3f9b
commit 0853339838
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/service/template/ReportTemplateServiceImpl.java
+4 -3
View File
@@ -175,7 +175,7 @@ public class ReportTemplateServiceImpl implements ReportTemplateService {
// 超管/管理端操作的就是公共模版 // 超管/管理端操作的就是公共模版
boolean isPublic = (isSuperAdmin || manageEndPoint) && ObjectUtil.isNull(targetOrganId); boolean isPublic = (isSuperAdmin || manageEndPoint) && ObjectUtil.isNull(targetOrganId);
Long organId = isPublic ? loginOrganId : targetOrganId; Long organId = ObjectUtil.defaultIfNull(targetOrganId, loginOrganId);
Long templateId = createReqVO.getId(); Long templateId = createReqVO.getId();
// 校验存在 // 校验存在
@@ -204,6 +204,7 @@ public class ReportTemplateServiceImpl implements ReportTemplateService {
copyTemplateDO.setType(ReportTemplateTypeEnum.SYSTEM); copyTemplateDO.setType(ReportTemplateTypeEnum.SYSTEM);
} else { } else {
// 重置所属机构 // 重置所属机构
copyTemplateDO.setOrganId(organId);
copyTemplateDO.setType(ReportTemplateTypeEnum.CUSTOM); copyTemplateDO.setType(ReportTemplateTypeEnum.CUSTOM);
} }
templateMapper.insert(copyTemplateDO); templateMapper.insert(copyTemplateDO);
@@ -220,7 +221,7 @@ public class ReportTemplateServiceImpl implements ReportTemplateService {
// 超管/管理端操作的就是公共模版 // 超管/管理端操作的就是公共模版
boolean isPublic = (isSuperAdmin || manageEndPoint) && ObjectUtil.isNull(targetOrganId); boolean isPublic = (isSuperAdmin || manageEndPoint) && ObjectUtil.isNull(targetOrganId);
Long organId = isPublic ? loginOrganId : targetOrganId; Long organId = ObjectUtil.defaultIfNull(targetOrganId, loginOrganId);
Long templateId = updateReqVO.getId(); Long templateId = updateReqVO.getId();
// 校验存在 // 校验存在
@@ -801,7 +802,7 @@ public class ReportTemplateServiceImpl implements ReportTemplateService {
// 超管/管理端操作的就是公共模版 // 超管/管理端操作的就是公共模版
boolean isPublic = (isSuperAdmin || manageEndPoint) && ObjectUtil.isNull(targetOrganId); boolean isPublic = (isSuperAdmin || manageEndPoint) && ObjectUtil.isNull(targetOrganId);
Long organId = isPublic ? loginOrganId : targetOrganId; Long organId = ObjectUtil.defaultIfNull(targetOrganId, loginOrganId);
try { try {
// 读取文件json // 读取文件json