From c2cd507da74f1841d0133d4c9bff9025ce1066ba Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 09 七月 2024 10:00:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev'
---
src/main/java/com/mindskip/xzs/controller/admin/TagController.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/mindskip/xzs/controller/admin/TagController.java b/src/main/java/com/mindskip/xzs/controller/admin/TagController.java
index f241fa3..b739e97 100644
--- a/src/main/java/com/mindskip/xzs/controller/admin/TagController.java
+++ b/src/main/java/com/mindskip/xzs/controller/admin/TagController.java
@@ -9,6 +9,7 @@
import com.mindskip.xzs.service.TagService;
import lombok.Data;
import org.apache.commons.lang3.ObjectUtils;
+import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@@ -35,6 +36,9 @@
@RequestMapping(value = "/page/list", method = RequestMethod.POST)
public RestResponse<PageInfo<Tag>> pageList(@RequestBody TagVO tag) {
+ if (! CollectionUtils.isEmpty(webContext.getAdminDeptIds())) {
+ tag.setDeptId(webContext.getAdminDeptIds().get(0));
+ }
PageInfo<Tag> page = tagService.tagPage(tag);
return RestResponse.ok(page);
}
--
Gitblit v1.8.0