Commit 7d89088b by 邹磊浩

修改错题集列表

parent 41bcfdec
......@@ -23,10 +23,7 @@ import com.ruoyi.system.mapper.SysUserMapper;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.*;
import java.util.concurrent.atomic.AtomicReference;
import java.util.stream.Collectors;
......@@ -140,11 +137,18 @@ public class DbErrorListServiceImpl implements IDbErrorListService {
SysUser sysUser = sysUserMapper.selectById(userId);
if (sysUser != null) {
String deptList = sysUser.getDeptList();
if (StringUtils.isNotEmpty(deptList) && deptList.contains(",")) {
String[] split = deptList.split(",");
List<SysUser> sysUsers = sysUserMapper.selectList(Wrappers.<SysUser>lambdaQuery()
.eq(SysUser::getSex, "0")
.in(SysUser::getDeptList, split));
if (StringUtils.isNotEmpty(deptList)) {
List<SysUser> sysUsers = new ArrayList<>();
if (deptList.contains(",")) {
String[] split = deptList.split(",");
sysUsers = sysUserMapper.selectList(Wrappers.<SysUser>lambdaQuery()
.eq(SysUser::getSex, "0")
.in(SysUser::getDeptList, split));
} else {
sysUsers = sysUserMapper.selectList(Wrappers.<SysUser>lambdaQuery()
.eq(SysUser::getSex, "0")
.eq(SysUser::getDeptList, deptList));
}
if (!sysUsers.isEmpty()) {
List<Long> userIds = sysUsers.stream()
.map(SysUser::getUserId)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment