From 4b530254b2f4e7ba8914d08a4b04dc7d9ce8d31d Mon Sep 17 00:00:00 2001 From: gaoxq <376340421@qq.com> Date: Sat, 30 Aug 2025 16:52:09 +0800 Subject: [PATCH] =?UTF-8?q?API=E6=95=B0=E6=8D=AE=E8=A1=A8=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sys/pageController/dataPageController.java | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/mini/capi/sys/pageController/dataPageController.java b/src/main/java/com/mini/capi/sys/pageController/dataPageController.java index 86688e6..16d41d0 100644 --- a/src/main/java/com/mini/capi/sys/pageController/dataPageController.java +++ b/src/main/java/com/mini/capi/sys/pageController/dataPageController.java @@ -6,6 +6,7 @@ import com.mini.capi.biz.domain.SyncTablesView; import com.mini.capi.biz.service.DbConfigService; import com.mini.capi.biz.service.SyncTablesViewService; import jakarta.annotation.Resource; +import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -32,11 +33,14 @@ public class dataPageController { @GetMapping("/getTableList") public List getTableList(String dbId, String targetTable) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq(dbId != null && !dbId.isBlank(), "db_id", dbId) - .like(targetTable != null && !targetTable.isBlank(), "target_table", targetTable) - .orderByDesc("create_time") - ; - return tablesViewService.list(queryWrapper); + return tablesViewService.list( + new QueryWrapper() + .eq(StringUtils.hasText(dbId), "db_id", dbId) + .and(StringUtils.hasText(targetTable), + w -> w.like("target_table", targetTable) + .or() + .like("task_name", targetTable)) + .orderByDesc("create_time") + ); } }