From 0b357d525c83203162eb053aed9c87604156f94a Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期二, 09 七月 2024 10:58:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_dept'
---
src/main/java/com/mindskip/xzs/controller/admin/TagController.java | 6 ++----
1 files changed, 2 insertions(+), 4 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 b739e97..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,6 +1,5 @@
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;
@@ -28,9 +27,7 @@
@RequestMapping(value = "/list", method = RequestMethod.GET)
public RestResponse<List<Tag>> pageList() {
- LambdaQueryWrapper<Tag> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.in(ObjectUtils.isNotEmpty(getAdminDeptIds()), Tag::getDeptId, getAdminDeptIds());
- List<Tag> list = tagService.list(queryWrapper);
+ List<Tag> list = tagService.list(getAdminDeptIds());
return RestResponse.ok(list);
}
@@ -56,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