diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionPersistPublishAndNotify.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionPersistPublishAndNotify.java index 3e813991f8c9a0810c87c81e2588fabdfdbd20d0..7038cbc04df5e69ed48f5e9372da3d0874daed9c 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionPersistPublishAndNotify.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionPersistPublishAndNotify.java @@ -177,7 +177,7 @@ public class ActionPersistPublishAndNotify extends BaseAction { //将读者以及作者信息持久化到数据库中 if( !wi.getSkipPermission() ) { try { - documentPersistService.refreshDocumentPermission( id, wi.getReaderList(), wi.getAuthorList() ); + document = documentPersistService.refreshDocumentPermission( id, wi.getReaderList(), wi.getAuthorList() ); } catch (Exception e) { check = false; Exception exception = new ExceptionDocumentInfoProcess(e, "系统在核对文档访问管理权限信息时发生异常!"); diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionPersistPublishByWorkFlow.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionPersistPublishByWorkFlow.java index 0d97085caaab76071b9c38471bd0859f40d9d7b7..3975a05ac3bc1efb320611daa8cef717b2a1c7da 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionPersistPublishByWorkFlow.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionPersistPublishByWorkFlow.java @@ -365,7 +365,7 @@ public class ActionPersistPublishByWorkFlow extends BaseAction { if ( check && !wi.getSkipPermission() ) { //将读者以及作者信息持久化到数据库中 try { - documentPersistService.refreshDocumentPermission( document.getId(), wi.getReaderList(), wi.getAuthorList() ); + document = documentPersistService.refreshDocumentPermission( document.getId(), wi.getReaderList(), wi.getAuthorList() ); } catch (Exception e) { check = false; Exception exception = new ExceptionDocumentInfoProcess(e, "系统在核对文档访问管理权限信息时发生异常!"); diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionPersistPublishContent.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionPersistPublishContent.java index 0d12cbd9bd5d0a396d8da0c2627710a64aaad35e..5682212c3e681c21d672038f2d27b95c9bdb34a8 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionPersistPublishContent.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionPersistPublishContent.java @@ -381,7 +381,7 @@ public class ActionPersistPublishContent extends BaseAction { if ( check && !wi.getSkipPermission() ) { //将读者以及作者信息持久化到数据库中 try { - documentPersistService.refreshDocumentPermission( document.getId(), wi.getReaderList(), wi.getAuthorList() ); + document = documentPersistService.refreshDocumentPermission( document.getId(), wi.getReaderList(), wi.getAuthorList() ); } catch (Exception e) { check = false; Exception exception = new ExceptionDocumentInfoProcess(e, "系统在核对文档访问管理权限信息时发生异常!"); diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionPersistSaveDocument.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionPersistSaveDocument.java index 97b77bc982a069afeb979f6c86d61960997e4fca..19d98b466e9b09967079ccb4ef2fb5f66b246895 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionPersistSaveDocument.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionPersistSaveDocument.java @@ -365,7 +365,7 @@ public class ActionPersistSaveDocument extends BaseAction { if (check) { try {//将读者以及作者信息持久化到数据库中 - documentPersistService.refreshDocumentPermission( document.getId(), wi.getReaderList(), wi.getAuthorList() ); + document = documentPersistService.refreshDocumentPermission( document.getId(), wi.getReaderList(), wi.getAuthorList() ); } catch (Exception e) { check = false; Exception exception = new ExceptionDocumentInfoProcess(e, "系统在核对文档访问管理权限信息时发生异常!"); diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/service/DocumentPersistService.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/service/DocumentPersistService.java index b2dd375f50f9e3d4966d024332658e3e73bcf981..854639fae61c678c6e2251bd79c2d16a2056a1b7 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/service/DocumentPersistService.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/service/DocumentPersistService.java @@ -298,15 +298,17 @@ public class DocumentPersistService { * @param authorList * @throws Exception */ - public void refreshDocumentPermission( String docId, List readerList, List authorList ) throws Exception { + public Document refreshDocumentPermission( String docId, List readerList, List authorList ) throws Exception { if( StringUtils.isEmpty( docId ) ){ throw new Exception("docId is empty!"); } - permissionService.refreshDocumentPermission( docId, readerList, authorList); + Document document = permissionService.refreshDocumentPermission( docId, readerList, authorList); new CmsBatchOperationPersistService().addOperation( CmsBatchOperationProcessService.OPT_OBJ_DOCUMENT, CmsBatchOperationProcessService.OPT_TYPE_PERMISSION, docId, docId, "刷新文档权限:ID=" + docId ); + + return document; } /** diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/service/PermissionOperateService.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/service/PermissionOperateService.java index 1c4e2019fca9c91741c537fae90b5c53ef17143c..26839847b88718b1b661b5c67e8d46c7150e2c4f 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/service/PermissionOperateService.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/service/PermissionOperateService.java @@ -33,11 +33,11 @@ public class PermissionOperateService { * @param authorList * @throws Exception */ - public void refreshDocumentPermission( String docId, List readerList, List authorList ) throws Exception { + public Document refreshDocumentPermission( String docId, List readerList, List authorList ) throws Exception { List permissionList = composeDocmentAllPermissions(readerList, authorList); try { //将读者以及作者信息持久化到数据库中 - refreshDocumentPermission( docId, permissionList ); + return refreshDocumentPermission( docId, permissionList ); } catch (Exception e) { throw e; } @@ -141,13 +141,14 @@ public class PermissionOperateService { * @param permissionList * @throws Exception */ - public void refreshDocumentPermission( String docId, List permissionList ) throws Exception { + public Document refreshDocumentPermission( String docId, List permissionList ) throws Exception { if( StringUtils.isEmpty(docId) ){ throw new Exception( "docId is empty!" ); } + Document document = null; try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create() ) { emc.beginTransaction( Document.class ); - Document document = emc.find( docId, Document.class ); + document = emc.find( docId, Document.class ); if( document != null ) { //清空文档权限信息 @@ -196,12 +197,12 @@ public class PermissionOperateService { if( ListTools.isEmpty( document.getAuthorPersonList() ) && ListTools.isEmpty( document.getAuthorUnitList() ) && ListTools.isEmpty( document.getAuthorGroupList() )) { //编辑全部都为空,则是创建人可编辑 - document.addToAuthorPersonList( document.getCreatorPerson() ); + document.addToReadPersonList( document.getCreatorPerson() ); document.addToAuthorPersonList( document.getCreatorPerson() ); } if( ListTools.isEmpty( document.getManagerList() ) ) { //管理全部都为空,则是创建人可以管理 - document.addToManagerList( document.getCreatorPerson() ); + document.addToReadPersonList( document.getCreatorPerson() ); document.addToManagerList( document.getCreatorPerson() ); } @@ -211,6 +212,8 @@ public class PermissionOperateService { } catch ( Exception e ) { throw e; } + + return document; } // private boolean existsPermission(List permissionList, String objectType, String permissionCode) {