From 9645aee946dedbb353528973d99e53c3c1da393a Mon Sep 17 00:00:00 2001 From: o2lee Date: Mon, 23 Mar 2020 15:29:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8D=95=E7=8B=AC=E5=88=B7?= =?UTF-8?q?=E6=96=B0=E6=96=87=E6=A1=A3=E9=98=85=E8=AF=BB=E6=9D=83=E9=99=90?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E5=8D=B3=E6=97=B6=E7=94=9F=E6=95=88=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=9A=20=E4=B8=BA=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B8=85=E9=99=A4=E7=BC=93=E5=AD=98=E6=93=8D?= =?UTF-8?q?=E4=BD=9C=E6=93=8D=E4=BD=9C=EF=BC=88=E5=9B=A0=E7=BC=93=E5=AD=98?= =?UTF-8?q?=E5=BD=B1=E5=93=8D=E5=AF=BC=E8=87=B4=E4=B8=8D=E8=83=BD=E7=94=9F?= =?UTF-8?q?=E6=95=88=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../permission/ActionRefreshDocumentPermission.java | 9 +++++---- .../control/service/DocumentPersistService.java | 4 ++++ .../control/service/PermissionOperateService.java | 10 +++++++--- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/o2server/x_cms_assemble_control/src/main/webapp/describe/sources/com/x/cms/assemble/control/jaxrs/permission/ActionRefreshDocumentPermission.java b/o2server/x_cms_assemble_control/src/main/webapp/describe/sources/com/x/cms/assemble/control/jaxrs/permission/ActionRefreshDocumentPermission.java index c860da6bb3..8ea26d3095 100644 --- a/o2server/x_cms_assemble_control/src/main/webapp/describe/sources/com/x/cms/assemble/control/jaxrs/permission/ActionRefreshDocumentPermission.java +++ b/o2server/x_cms_assemble_control/src/main/webapp/describe/sources/com/x/cms/assemble/control/jaxrs/permission/ActionRefreshDocumentPermission.java @@ -49,9 +49,10 @@ public class ActionRefreshDocumentPermission extends BaseAction { if (check) { if ( ListTools.isEmpty(wi.getPermissionList())) { - check = false; - Exception exception = new ExceptionServiceLogic("文档权限为空，该文档将没有任何用户可以访问。ID：" + wi.getDocId()); - result.error(exception); + wi.setPermissionList(new ArrayList<>()); +// check = false; +// Exception exception = new ExceptionServiceLogic("文档权限为空，该文档将没有任何用户可以访问。ID：" + wi.getDocId()); +// result.error(exception); } } @@ -73,7 +74,7 @@ public class ActionRefreshDocumentPermission extends BaseAction { if (check) { try { - documentPersistService.refreshDocumentPermission(document.getId(), wi.getPermissionList()); + documentPersistService.refreshDocumentPermission( document.getId(), wi.getPermissionList() ); } catch (Exception e) { check = false; Exception exception = new ExceptionServiceLogic(e, "系统在为文档设置用户访问权限过程中发生异常。ID：" + wi.getDocId()); diff --git a/o2server/x_cms_assemble_control/src/main/webapp/describe/sources/com/x/cms/assemble/control/service/DocumentPersistService.java b/o2server/x_cms_assemble_control/src/main/webapp/describe/sources/com/x/cms/assemble/control/service/DocumentPersistService.java index a7dd0b0bc1..5c5c9051e9 100644 --- a/o2server/x_cms_assemble_control/src/main/webapp/describe/sources/com/x/cms/assemble/control/service/DocumentPersistService.java +++ b/o2server/x_cms_assemble_control/src/main/webapp/describe/sources/com/x/cms/assemble/control/service/DocumentPersistService.java @@ -319,5 +319,9 @@ public class DocumentPersistService { throw new Exception("docId is empty!"); } permissionService.refreshDocumentPermission(docId, permissionList); + + new CmsBatchOperationPersistService().addOperation( + CmsBatchOperationProcessService.OPT_OBJ_DOCUMENT, + CmsBatchOperationProcessService.OPT_TYPE_PERMISSION, docId, docId, "单独刷新文档权限：ID=" + docId ); } } diff --git a/o2server/x_cms_assemble_control/src/main/webapp/describe/sources/com/x/cms/assemble/control/service/PermissionOperateService.java b/o2server/x_cms_assemble_control/src/main/webapp/describe/sources/com/x/cms/assemble/control/service/PermissionOperateService.java index 961a6ef705..17f0a213bc 100644 --- a/o2server/x_cms_assemble_control/src/main/webapp/describe/sources/com/x/cms/assemble/control/service/PermissionOperateService.java +++ b/o2server/x_cms_assemble_control/src/main/webapp/describe/sources/com/x/cms/assemble/control/service/PermissionOperateService.java @@ -22,7 +22,7 @@ public class PermissionOperateService { private static Logger logger = LoggerFactory.getLogger(PermissionOperateService.class); /** * 根据文档ID，为文档设置用户访问和管理权限 - * @param document + * @param docId * @param readerList * @param authorList * @throws Exception @@ -131,7 +131,7 @@ public class PermissionOperateService { /** * 根据文档ID，为文档设置用户访问和管理权限 - * @param docmentId + * @param docId * @param permissionList * @throws Exception */ @@ -154,7 +154,11 @@ public class PermissionOperateService { document.setAuthorGroupList( null ); if( ListTools.isNotEmpty( permissionList ) ){ - for( PermissionInfo permission : permissionList ){ + for( PermissionInfo permission : permissionList ){ + //如果Code为空，则使用Nameg来填充 + if( StringUtils.isEmpty( permission.getPermissionObjectCode() )){ + permission.setPermissionObjectCode( permission.getPermissionObjectName() ); + } if( "管理".equals( permission.getPermission() )) { document.addManagerList(permission.getPermissionObjectCode()); }else if( "读者".equals( permission.getPermission() ) || "阅读".equals( permission.getPermission() )) { -- GitLab