|
|
@@ -18,6 +18,7 @@ import com.ydtech.modules.admin.model.*;
|
|
|
import com.ydtech.modules.admin.model.dto.QuTeamNumDto;
|
|
|
import com.ydtech.modules.admin.model.dto.QuUserNumDto;
|
|
|
import com.ydtech.modules.admin.model.dto.SysUserDto;
|
|
|
+import com.ydtech.modules.admin.model.po.SysUserIsDial;
|
|
|
import com.ydtech.modules.admin.model.po.SysUserTreeShowLevel;
|
|
|
import com.ydtech.modules.admin.model.vo.*;
|
|
|
import com.ydtech.modules.admin.service.*;
|
|
|
@@ -73,6 +74,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
|
|
|
@Autowired
|
|
|
private SysUserTreeShowLevelService sysUserTreeShowLevelService;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private SysUserIsDialService sysUserIsDialService;
|
|
|
+
|
|
|
@Override
|
|
|
public IPage<SysUserBaseVO> findUserList(PageDto<SysUserDto> pageDto) {
|
|
|
PageVo<SysUserBaseVO> pageVo = new PageVo();
|
|
|
@@ -336,6 +340,16 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+ LambdaQueryWrapper<SysUserIsDial> isWrapper = new LambdaQueryWrapper<>();
|
|
|
+ isWrapper.in(SysUserIsDial::getUserId, ids);
|
|
|
+ List<SysUserIsDial> isDialList = sysUserIsDialService.list(isWrapper);
|
|
|
+ for (SysUser record : records) {
|
|
|
+ for (SysUserIsDial isDial : isDialList) {
|
|
|
+ if (record.getId().equals(isDial.getUserId())) {
|
|
|
+ record.setIsDial(isDial.getIsDial());
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
return sysUserIPage;
|
|
|
}
|