From 2d928646669fe6026c7d63f6b409d9b2790aa65e Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期五, 19 七月 2024 16:09:20 +0800
Subject: [PATCH] feat：设置部门管理员报错解决
---
src/main/java/com/mindskip/xzs/service/impl/TagServiceImpl.java | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
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 9938353..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
@@ -26,13 +25,21 @@
@Override
public PageInfo<Tag> tagPage(TagVO tag) {
return PageHelper.startPage(tag.getPageIndex(), tag.getPageSize(), "id desc").doSelectPageInfo(() ->
- new LambdaQueryChainWrapper<>(baseMapper)
- .like(StringUtils.hasText(tag.getName()), Tag::getName, tag.getName())
- .list()
+ baseMapper.page(tag)
);
}
@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