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/service/impl/TagServiceImpl.java | 15 ++++++++++++---
src/main/java/com/mindskip/xzs/service/TagService.java | 2 ++
src/main/java/com/mindskip/xzs/controller/admin/TagController.java | 6 ++----
3 files changed, 16 insertions(+), 7 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);
}
diff --git a/src/main/java/com/mindskip/xzs/service/TagService.java b/src/main/java/com/mindskip/xzs/service/TagService.java
index 42a1e87..64ce486 100644
--- a/src/main/java/com/mindskip/xzs/service/TagService.java
+++ b/src/main/java/com/mindskip/xzs/service/TagService.java
@@ -17,6 +17,8 @@
PageInfo<Tag> tagPage(TagVO tag);
+ List<Tag> list(List<Integer> list);
+
void saveBatchUserTag(List<UserTag> list);
void removeUserTagByUserId(Integer id);
diff --git a/src/main/java/com/mindskip/xzs/service/impl/TagServiceImpl.java b/src/main/java/com/mindskip/xzs/service/impl/TagServiceImpl.java
index 4de1e2e..6c7271e 100644
--- a/src/main/java/com/mindskip/xzs/service/impl/TagServiceImpl.java
+++ b/src/main/java/com/mindskip/xzs/service/impl/TagServiceImpl.java
@@ -1,6 +1,6 @@
package com.mindskip.xzs.service.impl;
-import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
@@ -9,11 +9,10 @@
import com.mindskip.xzs.domain.vo.TagVO;
import com.mindskip.xzs.repository.TagMapper;
import com.mindskip.xzs.service.TagService;
+import org.apache.commons.lang3.ObjectUtils;
import org.springframework.stereotype.Service;
-import org.springframework.util.StringUtils;
import java.util.List;
-import java.util.stream.Collectors;
/**
* @author gonghl
@@ -31,6 +30,16 @@
}
@Override
+ public List<Tag> list(List<Integer> list) {
+ LambdaQueryWrapper<Tag> queryWrapper = new LambdaQueryWrapper<>();
+ if (ObjectUtils.isNotEmpty(list)) {
+ queryWrapper.in(Tag::getDeptId, list);
+ queryWrapper.or().isNull(Tag::getDeptId);
+ }
+ return list(queryWrapper);
+ }
+
+ @Override
public void saveBatchUserTag(List<UserTag> list) {
baseMapper.saveBatchUserTag(list);
}
--
Gitblit v1.8.0