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/controller/caseHandler/ViolationsController.java | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/controller/caseHandler/ViolationsController.java b/ycl-platform/src/main/java/com/ycl/controller/caseHandler/ViolationsController.java
index 803082d..dacebd9 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/caseHandler/ViolationsController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/caseHandler/ViolationsController.java
@@ -45,10 +45,8 @@
public CommonResult searchViolations(@RequestParam Integer size,
@RequestParam Integer current,
@RequestParam(required = false) String keyWord) {
- Page<ViolationSettingVO> dataDictionaryPage = new Page<>();
- dataDictionaryPage.setSize(size);
- dataDictionaryPage.setCurrent(current);
- return CommonResult.success(iDataDictionaryService.listViolations(dataDictionaryPage, keyWord));
+
+ return CommonResult.success(iDataDictionaryService.listViolations(current, size, keyWord));
}
/**
@@ -58,7 +56,7 @@
**/
@ApiOperation(value = "鍒犻櫎杩濊绫诲瀷")
@DeleteMapping("/delete")
- @LogSave(operationType = "杩愯惀鍩虹璁剧疆",contain = "鍒犻櫎杩濊浜嬮」")
+ @LogSave(operationType = "杩愯惀鍩虹璁剧疆", contain = "鍒犻櫎杩濊浜嬮」")
public CommonResult removeViolation(@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 removeViolations(@RequestParam String[] ids) {
return CommonResult.success(iDataDictionaryService.removeBatchByIds(Arrays.asList(ids)));
@@ -177,7 +175,7 @@
**/
@ApiOperation(value = "娣诲姞鎵�灞炵被鍨�/澶х被/灏忕被/妗堢敱")
@PostMapping("/addition/type")
- @LogSave(operationType = "杩愯惀鍩虹璁剧疆",contain = "娣诲姞杩濊浜嬮」")
+ @LogSave(operationType = "杩愯惀鍩虹璁剧疆", contain = "娣诲姞杩濊浜嬮」")
public CommonResult addViolationType(@RequestBody @Validated DataDictionary dataDictionary) {
return CommonResult.success(iDataDictionaryService.save(dataDictionary));
}
--
Gitblit v1.8.0