09-17-修改通讯录获权限判断
This commit is contained in:
@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil;
|
|||||||
import cn.hutool.core.convert.Convert;
|
import cn.hutool.core.convert.Convert;
|
||||||
import cn.hutool.core.util.ObjectUtil;
|
import cn.hutool.core.util.ObjectUtil;
|
||||||
import com.baomidou.mybatisplus.core.conditions.Wrapper;
|
import com.baomidou.mybatisplus.core.conditions.Wrapper;
|
||||||
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
@ -17,6 +18,8 @@ import org.dromara.common.core.utils.StringUtils;
|
|||||||
import org.dromara.common.mybatis.core.page.PageQuery;
|
import org.dromara.common.mybatis.core.page.PageQuery;
|
||||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||||
import org.dromara.common.satoken.utils.LoginHelper;
|
import org.dromara.common.satoken.utils.LoginHelper;
|
||||||
|
import org.dromara.project.domain.BusUserProjectRelevancy;
|
||||||
|
import org.dromara.project.service.impl.BusUserProjectRelevancyServiceImpl;
|
||||||
import org.dromara.system.domain.SysDept;
|
import org.dromara.system.domain.SysDept;
|
||||||
import org.dromara.system.domain.SysUser;
|
import org.dromara.system.domain.SysUser;
|
||||||
import org.dromara.system.domain.SysUserFile;
|
import org.dromara.system.domain.SysUserFile;
|
||||||
@ -44,11 +47,15 @@ public class ChatFriendshipServiceImpl extends ServiceImpl<ChatFriendshipMapper,
|
|||||||
private SysUserMapper sysUserMapper;
|
private SysUserMapper sysUserMapper;
|
||||||
@Autowired
|
@Autowired
|
||||||
private ISysUserFileService userFileService;
|
private ISysUserFileService userFileService;
|
||||||
|
@Autowired
|
||||||
|
private BusUserProjectRelevancyServiceImpl busUserProjectRelevancyService;
|
||||||
|
|
||||||
public R<TableDataInfo<SysUserVo>> getAppUserList(SysUserBo user, PageQuery pageQuery){
|
public R<TableDataInfo<SysUserVo>> getAppUserList(SysUserBo user, PageQuery pageQuery){
|
||||||
SysUserVo sysUserVo = sysUserMapper.selectVoById(LoginHelper.getLoginUser().getUserId());
|
LambdaQueryWrapper<BusUserProjectRelevancy> lambdaQueryWrapper = new LambdaQueryWrapper<>();
|
||||||
if (sysUserVo.getProjectIds() == null || sysUserVo.getProjectIds().isEmpty()){
|
lambdaQueryWrapper.eq(BusUserProjectRelevancy::getUserId, LoginHelper.getUserId());
|
||||||
return R.fail("该账号暂无项目组,请联系管理员尽快分配");
|
List<BusUserProjectRelevancy> one = busUserProjectRelevancyService.list(lambdaQueryWrapper);
|
||||||
|
if (one == null || one.isEmpty()){
|
||||||
|
return R.fail("该账号暂无项目组,请尽快联系管理员进行分配");
|
||||||
}
|
}
|
||||||
Page<SysUserVo> page = sysUserMapper.selectPageUserList(pageQuery.build(), this.buildQueryWrapper(user));
|
Page<SysUserVo> page = sysUserMapper.selectPageUserList(pageQuery.build(), this.buildQueryWrapper(user));
|
||||||
List<SysUserVo> userVoList = page.getRecords();
|
List<SysUserVo> userVoList = page.getRecords();
|
||||||
|
|||||||
Reference in New Issue
Block a user