Index: forgon-core/src/main/java/com/forgon/security/dao/OperationDefineDaoImpl.java =================================================================== diff -u -r27061 -r28046 --- forgon-core/src/main/java/com/forgon/security/dao/OperationDefineDaoImpl.java (.../OperationDefineDaoImpl.java) (revision 27061) +++ forgon-core/src/main/java/com/forgon/security/dao/OperationDefineDaoImpl.java (.../OperationDefineDaoImpl.java) (revision 28046) @@ -57,6 +57,12 @@ //配置的值不为空且不为false时才会在权限分配页面显示 if(StringUtils.isBlank(mappingConfigPropertyName) || (StringUtils.isNotBlank(configValue) && !StringUtils.equalsIgnoreCase("false", configValue))){ + ////DGZYY-164 【审核打包】名称改为【包装管理】 + String nameSchemeOfReviewModule = CssdUtils2.getSystemSetConfigByName("nameSchemeOfReviewModule"); + String modelName = modelNameBean.getModleName(); + if(StringUtils.equals(modelName, "审核打包模块") && StringUtils.equals(nameSchemeOfReviewModule, "2")){ + modelNameBean.setModleName("包装管理模块"); + } List operationBeanList = modelNameBean.getOperationBeanList(); if(CollectionUtils.isNotEmpty(operationBeanList)){ List newOperationBeanList = null; @@ -69,8 +75,13 @@ if(StringUtils.isBlank(mappingConfigPropertyName) || (StringUtils.isNotBlank(configValue) && !StringUtils.equalsIgnoreCase("false", configValue))){ OperationBean newOperationBean = new OperationBean(); - newOperationBean.setOperationId(operationBean.getOperationId()); - newOperationBean.setOperationName(operationBean.getOperationName()); + String operationId = operationBean.getOperationId(); + newOperationBean.setOperationId(operationId); + if(StringUtils.equals(operationId, "SSTS_Tousse_Review") && StringUtils.equals(nameSchemeOfReviewModule, "2")){ + newOperationBean.setOperationName("包装管理"); + }else{ + newOperationBean.setOperationName(operationBean.getOperationName()); + } if(newOperationBeanList == null){ newOperationBeanList = new ArrayList(); } Index: forgon-core/src/main/java/com/forgon/portal/action/PortalPageAction.java =================================================================== diff -u -r21533 -r28046 --- forgon-core/src/main/java/com/forgon/portal/action/PortalPageAction.java (.../PortalPageAction.java) (revision 21533) +++ forgon-core/src/main/java/com/forgon/portal/action/PortalPageAction.java (.../PortalPageAction.java) (revision 28046) @@ -16,6 +16,7 @@ import com.forgon.portal.model.PortalPage; import com.forgon.portal.service.PortalPageManager; import com.forgon.security.service.OperationManager; +import com.forgon.security.tools.CssdUtils2; import com.forgon.tools.Constants; import com.forgon.tools.StrutsParamUtils; import com.forgon.tools.json.JsonPropertyFilter; @@ -55,6 +56,22 @@ if(StringUtils.isNotBlank(itemsColIdSortIndex)){ hasOperationPortalItems = sortItemsByItemIndex(hasOperationPortalItems, splitPortalItemIdToString(itemsColIdSortIndex)); } + + for(PortalItem item : hasOperationPortalItems){ + String orginalItemTitle = item.getTitle(); + //DGZYY-164 【审核打包】名称改为【包装管理】 + String nameSchemeOfReviewModule = CssdUtils2.getSystemSetConfigByName("nameSchemeOfReviewModule"); + if(StringUtils.equals("reviewPacking", item.getItemId())){ + if(StringUtils.equals(nameSchemeOfReviewModule, "2")){ + item.setTitle("包装管理"); + }else{ + item.setTitle("审核打包"); + } + }else{ + item.setTitle(orginalItemTitle); + } + } + portalPage.setPortalItems(hasOperationPortalItems); returnSortablePortalPages.add(portalPage); }