From e9bf5a0070b5fbdf9afd4475adbf51e46f579040 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 17 四月 2025 17:20:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_ztzb' into dev_ztzb
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CustomServiceImpl.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CustomServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CustomServiceImpl.java
index c5942ef..44ee431 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CustomServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CustomServiceImpl.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.domain.entity.Custom;
+import com.ruoyi.common.utils.QueryWrappers;
import com.ruoyi.system.mapper.CustomMapper;
import com.ruoyi.system.service.CustomService;
import lombok.AllArgsConstructor;
@@ -26,9 +27,8 @@
private CustomMapper customMapper;
@Override
- public Map<String, Object> selectCustomPageList(IPage<Custom> page, Custom custom) {
-
- return null;
+ public IPage<Custom> selectCustomPageList(IPage<Custom> page, Custom custom) {
+ return customMapper.selectCustomPageList(page, QueryWrappers.queryWrappers(custom));
}
@Override
--
Gitblit v1.9.3