From 7a49bcc5e561df7a9b65266a57a9c0896c0fd3d0 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期三, 10 五月 2023 13:48:56 +0800
Subject: [PATCH] Merge branch 'master' of ssh://sinata.cn:20202/java/HongRuiTang into master
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/conslole/ConfigController.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/conslole/ConfigController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/conslole/ConfigController.java
index 9fe89c8..047cfef 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/conslole/ConfigController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/conslole/ConfigController.java
@@ -7,6 +7,9 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
+import java.util.List;
+
/**
* @author jqs34
* @version 1.0
@@ -18,15 +21,21 @@
@RequestMapping("/config")
public class ConfigController {
- @Autowired
+ @Resource
private SysTagService sysTagService;
- @InnerAuth
+
@PostMapping("/getSysTag")
public R<SysTag> getSysTag(@RequestBody Long sysTagId)
{
- SysTag sysTag = sysTagService.getById(sysTagId);
+ SysTag sysTag = sysTagService.getByTagId(sysTagId);
return R.ok(sysTag);
}
+ @PostMapping("/listSysTag")
+ public R<List<SysTag>> listSysTag(@RequestBody Integer tagType)
+ {
+ List<SysTag> sysTagList = sysTagService.listByType(tagType);
+ return R.ok(sysTagList);
+ }
}
--
Gitblit v1.7.1