|
@@ -219,13 +219,14 @@ public class SysWorkUserServiceImpl extends ServiceImpl<SysWorkUserMapper, SysWo
|
|
@Override
|
|
@Override
|
|
@ApiOperation("集合查询")
|
|
@ApiOperation("集合查询")
|
|
public R<List<SysWorkVo>> list(ListDto listDto) {
|
|
public R<List<SysWorkVo>> list(ListDto listDto) {
|
|
|
|
+ Long sysId = listDto.getSysId();
|
|
//条件构造
|
|
//条件构造
|
|
JoinLambdaWrapper<SysWorkUser> joinLambdaWrapper = new JoinLambdaWrapper<>(SysWorkUser.class)
|
|
JoinLambdaWrapper<SysWorkUser> joinLambdaWrapper = new JoinLambdaWrapper<>(SysWorkUser.class)
|
|
.in(SysWorkUser::getId, listDto.getId())
|
|
.in(SysWorkUser::getId, listDto.getId())
|
|
- .leftJoin(SysUserRole.class, SysUserRole::getWorkUserId, SysWorkUser::getId)
|
|
|
|
|
|
+ .leftJoin(SysUserRole.class, SysUserRole::getWorkUserId, SysWorkUser::getId).eq(sysId != null, SysUserRole::getSysId, sysId)
|
|
.manyToManySelect(SysWorkVo::getRoleIds, Long.class, cb -> cb.add(SysUserRole::getRoleId))
|
|
.manyToManySelect(SysWorkVo::getRoleIds, Long.class, cb -> cb.add(SysUserRole::getRoleId))
|
|
.end()
|
|
.end()
|
|
- .leftJoin(SysUserDept.class, SysUserDept::getWorkUserId, SysWorkUser::getId)
|
|
|
|
|
|
+ .leftJoin(SysUserDept.class, SysUserDept::getWorkUserId, SysWorkUser::getId).eq(sysId != null, SysUserDept::getSysId, sysId)
|
|
.manyToManySelect(SysWorkVo::getDeptIds, Long.class, cb -> cb.add(SysUserDept::getDeptId))
|
|
.manyToManySelect(SysWorkVo::getDeptIds, Long.class, cb -> cb.add(SysUserDept::getDeptId))
|
|
.end();
|
|
.end();
|
|
//查询数据
|
|
//查询数据
|