From e5bf0d08d05f5c58224fe28cdf743a1bae88e3f0 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 30 十一月 2023 16:48:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-platform/src/main/java/com/ycl/controller/caseHandler/IllegalBuildingController.java | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/controller/caseHandler/IllegalBuildingController.java b/ycl-platform/src/main/java/com/ycl/controller/caseHandler/IllegalBuildingController.java
index 4f462ab..74ba142 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/caseHandler/IllegalBuildingController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/caseHandler/IllegalBuildingController.java
@@ -45,10 +45,8 @@
public CommonResult searchIllegalBuilding(@RequestParam Integer size,
@RequestParam Integer current,
@RequestParam(required = false) String keyWord) {
- Page<DataDictionary> dataDictionaryPage = new Page<>();
- dataDictionaryPage.setSize(size);
- dataDictionaryPage.setCurrent(current);
- return CommonResult.success(iDataDictionaryService.listIllegalBuildingSettings(dataDictionaryPage, keyWord));
+
+ return CommonResult.success(iDataDictionaryService.listIllegalBuildingSettings(current, size, keyWord));
}
/**
@@ -58,7 +56,7 @@
**/
@ApiOperation(value = "鍒犻櫎杩濆缓绫诲瀷")
@DeleteMapping("/delete")
- @LogSave(operationType = "杩愯惀鍩虹璁剧疆",contain = "鍒犻櫎杩濆缓浜嬮」")
+ @LogSave(operationType = "杩愯惀鍩虹璁剧疆", contain = "鍒犻櫎杩濆缓浜嬮」")
public CommonResult removeIllegalBuilding(@RequestParam Integer id) {
return CommonResult.success(iDataDictionaryService.removeById(id));
}
@@ -70,7 +68,7 @@
**/
@ApiOperation(value = "鎵归噺鍒犻櫎杩濆缓绫诲瀷")
@DeleteMapping("/batch_delete")
- @LogSave(operationType = "杩愯惀鍩虹璁剧疆",contain = "鎵归噺鍒犻櫎杩濆缓浜嬮」")
+ @LogSave(operationType = "杩愯惀鍩虹璁剧疆", contain = "鎵归噺鍒犻櫎杩濆缓浜嬮」")
public CommonResult removeIllegalBuildings(@RequestParam String[] ids) {
return CommonResult.success(iDataDictionaryService.removeBatchByIds(Arrays.asList(ids)));
}
@@ -128,7 +126,7 @@
**/
@ApiOperation(value = "娣诲姞鎵�灞炵被鍨�/绫诲埆")
@PostMapping("/addition/type")
- @LogSave(operationType = "杩愯惀鍩虹璁剧疆",contain = "娣诲姞杩濆缓浜嬮」")
+ @LogSave(operationType = "杩愯惀鍩虹璁剧疆", contain = "娣诲姞杩濆缓浜嬮」")
public CommonResult addIllegalBuildingTypeFirst(@RequestBody @Validated DataDictionary dataDictionary) {
return CommonResult.success(iDataDictionaryService.save(dataDictionary));
}
--
Gitblit v1.8.0