From cf547f4d9c56cf2d86ae60132aa7496bee93bf9c Mon Sep 17 00:00:00 2001
From: xing <xingjs@qq.com>
Date: 星期二, 21 二月 2023 17:12:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/lf/server/service/all/BaseQueryService.java | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/lf/server/service/all/BaseQueryService.java b/src/main/java/com/lf/server/service/all/BaseQueryService.java
index c138848..f171389 100644
--- a/src/main/java/com/lf/server/service/all/BaseQueryService.java
+++ b/src/main/java/com/lf/server/service/all/BaseQueryService.java
@@ -7,8 +7,8 @@
import com.lf.server.entity.ctrl.KeyValueEntity;
import com.lf.server.entity.ctrl.TabEntity;
import com.lf.server.entity.data.DictEntity;
-import com.lf.server.entity.data.DirEntity;
import com.lf.server.entity.data.DomainEntity;
+import com.lf.server.entity.data.MetaEntity;
import com.lf.server.helper.AesHelper;
import com.lf.server.helper.ClassHelper;
import com.lf.server.helper.StringHelper;
@@ -236,10 +236,10 @@
}
@Override
- public List<TabEntity> selectTabsByPage(String tab, Integer limit, Integer offset) {
+ public List<TabEntity> selectTabsByPage(String tab, String filters, Integer limit, Integer offset) {
tab = StringHelper.getLikeStr(tab);
- return baseQueryMapper.selectTabsByPage(tab, limit, offset);
+ return baseQueryMapper.selectTabsByPage(tab, filters, limit, offset);
}
@Override
@@ -263,7 +263,17 @@
}
@Override
- public List<DirEntity> selectBaseType() {
+ public List<KeyValueEntity> selectBaseType() {
return baseQueryMapper.selectBaseType();
}
+
+ @Override
+ public List<KeyValueEntity> selectBusinessType() {
+ return baseQueryMapper.selectBusinessType();
+ }
+
+ @Override
+ public List<KeyValueEntity> selectProject() {
+ return baseQueryMapper.selectProject();
+ }
}
--
Gitblit v1.9.3