From dfea866e55c725bd601ff84c92dff30f83057571 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期四, 30 三月 2023 19:56:59 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-platform/src/main/java/com/ycl/service/dict/impl/DataDictionaryServiceImpl.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/service/dict/impl/DataDictionaryServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/dict/impl/DataDictionaryServiceImpl.java
index 67ca01b..454d2ca 100644
--- a/ycl-platform/src/main/java/com/ycl/service/dict/impl/DataDictionaryServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/dict/impl/DataDictionaryServiceImpl.java
@@ -7,6 +7,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.entity.dict.DataDictionary;
import com.ycl.mapper.dict.DataDictionaryMapper;
+import com.ycl.mapper.dict.DataDictionaryMapper;
import com.ycl.service.dict.IDataDictionaryService;
import com.ycl.service.redis.RedisService;
import com.ycl.utils.common.LiveTimeMillisecond;
@@ -60,13 +61,19 @@
}
@Override
- public Page listIllegalBuildingSettings(Page<DataDictionary> dataDictionaryPage, String keyWord) {
+ public Page listIllegalBuildingSettings(Integer current, Integer size, String keyWord) {
+ Page<DataDictionary> dataDictionaryPage = new Page<>();
+ dataDictionaryPage.setSize(size);
+ dataDictionaryPage.setCurrent(current);
Page<DataDictionary> dataDictionaryPageList = dataDictionaryMapper.listDataDictionaryPage(dataDictionaryPage, keyWord);
return dataDictionaryPageList;
}
@Override
- public Page listViolations(Page<ViolationSettingVO> dataDictionaryPage, String keyWord) {
+ public Page listViolations(Integer current, Integer size, String keyWord) {
+ Page<ViolationSettingVO> dataDictionaryPage = new Page<>();
+ dataDictionaryPage.setSize(size);
+ dataDictionaryPage.setCurrent(current);
dataDictionaryPage.setOptimizeCountSql(false);
Page<ViolationSettingVO> dataDictionaryPageList = dataDictionaryMapper.listViolationPage(dataDictionaryPage, keyWord);
return dataDictionaryPageList;
--
Gitblit v1.8.0