From c10d6358b9f014375a13821465bc978d0c0da22e Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Wed, 29 May 2024 17:17:08 +0800
Subject: [PATCH] 通过E呼即办数据统计
---
src/main/java/org/springblade/modules/label/controller/LabelController.java | 35 +++++++++++++++++++++++++----------
1 files changed, 25 insertions(+), 10 deletions(-)
diff --git a/src/main/java/org/springblade/modules/label/controller/LabelController.java b/src/main/java/org/springblade/modules/label/controller/LabelController.java
index 4a31741..c8266f5 100644
--- a/src/main/java/org/springblade/modules/label/controller/LabelController.java
+++ b/src/main/java/org/springblade/modules/label/controller/LabelController.java
@@ -22,8 +22,10 @@
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
+import org.springblade.common.node.TreeIntegerNode;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.label.entity.LabelEntity;
@@ -71,16 +73,6 @@
return R.data(LabelWrapper.build().pageVO(pages));
}
- /**
- * 标签管理 分页
- */
- @GetMapping("/tree")
- @ApiOperationSupport(order = 2)
- @ApiOperation(value = "分页", notes = "传入label")
- public R<List<LabelVO>> tree(LabelEntity label) {
- List<LabelVO> pages = labelService.tree(label);
- return R.data( pages);
- }
/**
* 标签管理 自定义分页
@@ -101,6 +93,28 @@
@GetMapping("/getLabelList")
public R getLabelList(LabelVO label) {
return R.data(labelService.getLabelList(label));
+ }
+
+
+ /**
+ * 查询人员标签（不包含人这一级）
+ * @param label
+ * @return
+ */
+ @GetMapping("/getPersonLabelList")
+ public R getPersonLabelList(LabelVO label) {
+ return R.data(labelService.getPersonLabelList(label));
+ }
+
+ /**
+ * 标签管理 分页
+ */
+ @GetMapping("/tree")
+ @ApiOperationSupport(order = 2)
+ @ApiOperation(value = "树形接口", notes = "传入label")
+ public R<List<TreeIntegerNode>> tree(LabelVO label) {
+ List<TreeIntegerNode> pages = labelService.tree(label);
+ return R.data( pages);
}
/**
@@ -130,6 +144,7 @@
@ApiOperationSupport(order = 6)
@ApiOperation(value = "新增或修改", notes = "传入label")
public R submit(@Valid @RequestBody LabelEntity label) {
+ label.setCreateUser(AuthUtil.getUserId());
return R.status(labelService.saveOrUpdate(label));
}
--
Gitblit v1.9.3