From dcd238531d8154633b9c1e2188b81e519760a17e Mon Sep 17 00:00:00 2001 From: ludc Date: 星期二, 16 七月 2024 16:09:45 +0800 Subject: [PATCH] 调整项目结构,统一DTO、VO、PO、BO等对象到plt-web-api模块下,拷贝vci-file-integration、plt-web-api、vci-framework-api、vci-file-api等依赖下的对象到plt-web-api模块下,并取消对这些jar的引用(为了解决同路径同名独享导致打包运行时对象加载出错问题)。 --- Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmFunctionQueryServicePlatformImpl.java | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmFunctionQueryServicePlatformImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmFunctionQueryServicePlatformImpl.java index 8ba719e..1414528 100644 --- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmFunctionQueryServicePlatformImpl.java +++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmFunctionQueryServicePlatformImpl.java @@ -8,16 +8,17 @@ import com.vci.corba.portal.data.PLUILayout; import com.vci.frameworkcore.compatibility.ISmFunctionQueryService; import com.vci.frameworkcore.enumpck.ResourceControlTypeEnum; -import com.vci.frameworkcore.model.SmFunctionForPlatform1; -import com.vci.frameworkcore.model.SmRoleForPlatform1; -import com.vci.frameworkcore.pagemodel.MenuVO; -import com.vci.frameworkcore.pagemodel.SmFunctionVO; +import com.vci.model.SmFunctionForPlatform1; +import com.vci.model.SmRoleForPlatform1; +import com.vci.pagemodel.MenuVO; +import com.vci.pagemodel.SmFunctionVO; import com.vci.omd.utils.ObjectTool; +import com.vci.pagemodel.SmFunctionVO; import com.vci.starter.web.constant.QueryOptionConstant; import com.vci.starter.web.exception.VciBaseException; import com.vci.starter.web.pagemodel.*; import com.vci.starter.web.wrapper.VciQueryWrapperForDO; -import com.vci.web.pageModel.UIContentVO; +import com.vci.pagemodel.UIContentVO; import com.vci.web.service.UIEngineServiceI; import com.vci.web.service.WebBoServiceI; import com.vci.web.util.PlatformClientUtil; @@ -481,7 +482,7 @@ conditionMap.put(key,value); }); conditionMap.put("ploid", notIn ? QueryOptionConstant.NOTIN : QueryOptionConstant.IN + "select plfuncoid from plroleright where plroleoid in (" + WebUtil.toInSql(roleOids.toArray(new String[0])) + ")"); - VciQueryWrapperForDO queryWrapper = new VciQueryWrapperForDO(conditionMap,SmRoleForPlatform1.class); + VciQueryWrapperForDO queryWrapper = new VciQueryWrapperForDO(conditionMap, SmRoleForPlatform1.class); List<SmFunctionForPlatform1> functionForPlatform1s = boService.selectByQueryWrapper(queryWrapper, SmFunctionForPlatform1.class); if(!CollectionUtils.isEmpty(functionForPlatform1s)){ functions.addAll(functionForPlatform1s); -- Gitblit v1.9.3