From 1044c9c052907047990625674c4b9702bea2b44f Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期五, 27 九月 2024 09:11:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TUserTagController.java |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TUserTagController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TUserTagController.java
index e9df6f3..a4f5fa9 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TUserTagController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TUserTagController.java
@@ -1,6 +1,7 @@
 package com.ruoyi.other.controller;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.account.api.dto.TagListQueryDto;
 import com.ruoyi.account.api.dto.UnitListQueryDto;
@@ -73,8 +74,17 @@
 
         return R.ok(tUserTagService.getById(id));
     }
-
-
+    
+    
+    /**
+     * 获取所有有效数据
+     * @return
+     */
+    @PostMapping(value = "/getAllUserTag")
+    public R<List<TUserTag>> getAllUserTag(){
+        List<TUserTag> list = tUserTagService.list(new LambdaQueryWrapper<TUserTag>().eq(TUserTag::getDelFlag, 0));
+        return R.ok(list);
+    }
 
 }
 

--
Gitblit v1.7.1