From 7918c0611f1cdf1cad82250225307e5185abac4c Mon Sep 17 00:00:00 2001 From: ludc Date: 星期五, 27 十月 2023 10:37:49 +0800 Subject: [PATCH] bug修改：148（历史数据导入报错，当前分类没有设置编码规则，未找父级的编码规则的bug）；150（主数据新增时未先找当前层级的编码规则，再向上查找的bug） --- Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingSystemConfigService.java | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingSystemConfigService.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingSystemConfigService.java index cb1190b..9f1c212 100644 --- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingSystemConfigService.java +++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingSystemConfigService.java @@ -11,6 +11,8 @@ import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; +import java.util.Map; + /*** * 绯荤粺鎺ュ彛绠＄悊-鎺ュ彛閰嶇疆鏈嶅姟 * @author xiejun @@ -21,10 +23,10 @@ /** * 绯荤粺闆嗘垚鍩虹淇℃伅鍒楄〃 - * @param dockingSystemConfig 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑 + * @param condtionMap 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑 * @return 绯荤粺闆嗘垚鍩虹淇℃伅鏄剧ず瀵硅薄鍒楄〃 */ - IPage<DockingSystemConfigVO> page(DockingSystemConfig dockingSystemConfig, Query query); + IPage<DockingSystemConfigVO> page(Map<String,String> condtionMap, Query query); /** * 澧炲姞 绯荤粺闆嗘垚鐨勬帴鍙ｇ鐞嗕俊鎭� -- Gitblit v1.9.3