From 74b0e0814e37d640596f44ec86d20fa9ecce9ed6 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 05 二月 2025 10:42:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserTagController.java | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserTagController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserTagController.java
index dd40be3..54bd6b0 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserTagController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserTagController.java
@@ -6,6 +6,8 @@
import com.ruoyi.common.log.annotation.Log;
import com.ruoyi.common.log.enums.BusinessType;
import com.ruoyi.common.log.enums.OperatorType;
+import com.ruoyi.common.security.annotation.Logical;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
import com.ruoyi.other.api.dto.TagListQueryDto;
import com.ruoyi.account.api.model.TAppUserTag;
import com.ruoyi.account.service.TAppUserTagService;
@@ -33,7 +35,9 @@
private OtherClient otherClient;
@Resource
private TAppUserTagService appUserTagService;
-
+
+
+ @RequiresPermissions(value = {"/coupon", "/userTag"}, logical = Logical.OR)
@ApiOperation(value = "标签管理列表", tags = {"用户管理-用户标签管理"})
@PostMapping(value = "/tags/page")
public R<Page<TUserTag>> tagPage(@RequestBody TagListQueryDto tagListQueryDto) {
@@ -46,6 +50,9 @@
}
return R.ok(data);
}
+
+
+ @RequiresPermissions(value = {"/appUser/list"}, logical = Logical.OR)
@ApiOperation(value = "标签管理列表", tags = {"用户管理-用户标签管理"})
@GetMapping(value = "/tags/select")
public R<List<TUserTag>> select() {
@@ -55,8 +62,9 @@
R<Page<TUserTag>> pageR = otherClient.queryTagPage(tagListQueryDto);
return R.ok(pageR.getData().getRecords());
}
-
-
+
+
+ @RequiresPermissions(value = {"/userTag/add", "/userTag/update"}, logical = Logical.OR)
@ApiOperation(value = "标签添加或修改", tags = {"用户管理-用户标签管理"})
@PostMapping(value = "/tags/add")
@Log(title = "【用户标签管理】标签添加或修改", businessType = BusinessType.INSERT,operatorType = OperatorType.MANAGE)
@@ -65,7 +73,9 @@
otherClient.addorUpdateTag(tUserTag);
return R.ok();
}
-
+
+
+ @RequiresPermissions(value = {"/userTag/del"}, logical = Logical.OR)
@ApiOperation(value = "标签删除", tags = {"用户管理-用户标签管理"})
@DeleteMapping(value = "/tags/delete")
@Log(title = "【用户标签管理】删除标签", businessType = BusinessType.DELETE,operatorType = OperatorType.MANAGE)
--
Gitblit v1.7.1