From c5c10c1bb95f5bb7fdc8b714c5c998e78c26e0f7 Mon Sep 17 00:00:00 2001 From: 龚焕茏 <2842157468@qq.com> Date: 星期二, 09 七月 2024 09:47:43 +0800 Subject: [PATCH] feat:标签新增、下拉增加部门id --- src/main/java/com/mindskip/xzs/controller/admin/TagController.java | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 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 fd9a02d..7ab0415 100644 --- a/src/main/java/com/mindskip/xzs/controller/admin/TagController.java +++ b/src/main/java/com/mindskip/xzs/controller/admin/TagController.java @@ -1,11 +1,14 @@ package com.mindskip.xzs.controller.admin; import com.github.pagehelper.PageInfo; +import com.mindskip.xzs.base.BaseApiController; import com.mindskip.xzs.base.RestResponse; import com.mindskip.xzs.domain.Tag; import com.mindskip.xzs.domain.vo.TagVO; 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; @@ -18,18 +21,21 @@ @RestController @RequestMapping(value = "/api/admin/tag") @Data -public class TagController { +public class TagController extends BaseApiController { private final TagService tagService; @RequestMapping(value = "/list", method = RequestMethod.GET) public RestResponse<List<Tag>> pageList() { - List<Tag> list = tagService.list(); + List<Tag> list = tagService.list(getAdminDeptIds()); return RestResponse.ok(list); } @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); } @@ -47,6 +53,7 @@ @RequestMapping(value = "/edit", method = RequestMethod.POST) public RestResponse<Tag> update(@RequestBody Tag tag) { + tag.setDeptId(ObjectUtils.isNotEmpty(getAdminDeptIds()) ? getAdminDeptIds().get(0) : null); tagService.saveOrUpdate(tag); return RestResponse.ok(tag); } -- Gitblit v1.8.0