From 49f2eff2cf52e0f1719dfad43cafff11b378252c Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 20 十二月 2024 18:14:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/PointSettingController.java | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/PointSettingController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/PointSettingController.java
index c6062e4..9824721 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/PointSettingController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/PointSettingController.java
@@ -35,15 +35,14 @@
}
@GetMapping("/search")
@ApiOperation(value = "积分配置查询", tags = {"后台"})
- public R<List<PointSetting>> search(@RequestParam Integer id) {
+ public R<List<PointSetting>> search() {
List<PointSetting> list = pointSettingService.list();
return R.ok(list);
}
@PostMapping("/save")
@ApiOperation(value = "积分配置", tags = {"后台"})
public R<PointSetting> save(@RequestBody PointSettingDto pointSettingDto) {
- pointSettingService.remove(Wrappers.lambdaQuery());
- pointSettingService.saveBatch(pointSettingDto.getPointSettings());
+ pointSettingService.saveOrUpdateBatch(pointSettingDto.getPointSettings());
return R.ok();
}
--
Gitblit v1.7.1