From b4d0d9b1d58bc45b9b7f249fe6b3701e8db6c35f Mon Sep 17 00:00:00 2001 From: ludc Date: 星期五, 26 一月 2024 16:03:34 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSystemConfigServiceImpl.java | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSystemConfigServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSystemConfigServiceImpl.java index cd69a4d..9b0d5a3 100644 --- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSystemConfigServiceImpl.java +++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSystemConfigServiceImpl.java @@ -137,7 +137,6 @@ @Override public IPage<DockingSystemConfigVO> page(Map<String,String>codtionMap, Query query) { - IPage<DockingSystemConfig> pages = page(Condition.getPage(query), UBCSSqlKeyword.buildConditionByMapString(codtionMap)); List<DockingSystemConfig> dockingSystemConfigList= pages.getRecords(); dockingSystemConfigList.stream().forEach(dockingSystemConfig -> { @@ -152,7 +151,7 @@ // dockingSystemConfig.setSourceSysName(""); //dockingSystemConfig.setTargetSysName(""); }); - return DockingSystemConfigWrapper.build().pageVO(pages); + return DockingSystemConfigWrapper.build().pageVO(pages); } /** -- Gitblit v1.9.3