From 5a5b01fa9824a42e3eb033088a20e24c32b30dda Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期六, 17 八月 2024 16:17:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TEvaluationTagController.java | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TEvaluationTagController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TEvaluationTagController.java
index 9a49776..191d727 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TEvaluationTagController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TEvaluationTagController.java
@@ -38,8 +38,8 @@
}
@PostMapping("/getTagList")
- public R<List<TEvaluationTagVO>> getTagList() {
- return R.ok(evaluationTagService.getTagList());
+ public R<List<TEvaluationTagVO>> getTagList(@RequestParam("type") Integer type) {
+ return R.ok(evaluationTagService.getTagList(type));
}
@@ -80,13 +80,12 @@
@ResponseBody
- @DeleteMapping("/delEvaluationTag/{id}")
+ @DeleteMapping("/delEvaluationTag")
@ApiOperation(value = "删除评价标签", tags = {"管理后台-评价标签设置"})
- public AjaxResult<TInvoiceType> delEvaluationTag(@PathVariable Integer[] id){
+ public AjaxResult<TInvoiceType> delEvaluationTag(@RequestParam("id") Integer[] id){
List<TEvaluationTag> tEvaluationTags = evaluationTagService.listByIds(Arrays.asList(id));
for (TEvaluationTag evaluationTag : tEvaluationTags) {
- evaluationTag.setDelFlag(true);
- evaluationTagService.updateById(evaluationTag);
+ evaluationTagService.removeById(evaluationTag);
}
return AjaxResult.success();
}
--
Gitblit v1.7.1