From 4a2835ddadb796c69f180097b95f971dbab4687d Mon Sep 17 00:00:00 2001 From: ludc Date: 星期三, 13 九月 2023 09:09:14 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/mapper/StrategyMapper.java | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/mapper/StrategyMapper.java b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/mapper/StrategyMapper.java index ca2b3b5..cc4fa8f 100644 --- a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/mapper/StrategyMapper.java +++ b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/mapper/StrategyMapper.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; import com.vci.ubcs.system.entity.Strategy; @@ -11,7 +12,7 @@ /** * 瀵嗙爜绛栫暐(PlSysStrategy)琛ㄦ暟鎹簱璁块棶灞� * - * @author makejava + * @author ludc * @since 2023-03-20 15:16:15 */ public interface StrategyMapper extends BaseMapper<Strategy> { @@ -22,15 +23,15 @@ * @param page 鍒嗛〉瀵硅薄 * @return 瀵硅薄鍒楄〃 */ - List<Strategy> queryAllByPage(IPage page); + IPage<Strategy> queryAllByPage(IPage page,@Param("tenantId") String tenantId); /** * 缁熻鎬昏鏁� * - * @param plSysStrategy 鏌ヨ鏉′欢 + * @param sysStrategy 鏌ヨ鏉′欢 * @return 鎬昏鏁� */ - long count(Strategy plSysStrategy); + long count(Strategy sysStrategy); /** * 鏍规嵁鐢ㄦ埛鍚嶄互鍙婄鎴稩D鏌ヨ瀵嗙爜绛栫暐 @@ -46,7 +47,12 @@ */ Strategy queryByUserId(@Param("userId") Long userId); - Strategy queryByIsDefault(); + /** + * 鏌ヨ瀵嗙爜榛樿鐨勭瓥鐣� + * @param tenantId + * @return + */ + Strategy queryByIsDefault(@Param("tenantId") String tenantId); } -- Gitblit v1.9.3