From fc7baea99b51916d97d77fa1771cba7ed5f2f0ed Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期二, 09 七月 2024 10:44:30 +0800
Subject: [PATCH] feat：排除标签保留无标签、试卷排序
---
src/main/java/com/mindskip/xzs/controller/admin/TagController.java | 13 +++++++++++--
1 files changed, 11 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..b739e97 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,15 @@
package com.mindskip.xzs.controller.admin;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
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 +22,23 @@
@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();
+ LambdaQueryWrapper<Tag> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.in(ObjectUtils.isNotEmpty(getAdminDeptIds()), Tag::getDeptId, getAdminDeptIds());
+ List<Tag> list = tagService.list(queryWrapper);
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);
}
--
Gitblit v1.8.0