|
@@ -972,10 +972,11 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
|
|
public IPage selectUserList(Page page, UserDTO userDTO) {
|
|
public IPage selectUserList(Page page, UserDTO userDTO) {
|
|
|
|
|
|
// 认证状态查询条件
|
|
// 认证状态查询条件
|
|
- if (StrUtil.isNotBlank(userDTO.getSubType()) && userDTO.getCertStatus() != null) {
|
|
|
|
|
|
+// if (StrUtil.isNotBlank(userDTO.getSubType()) && userDTO.getCertStatus() != null) {
|
|
|
|
+ if (StrUtil.isNotBlank(userDTO.getSubType()) && userDTO.getCertType() != null) {
|
|
List<SysUserSub> userSubList = sysUserSubMapper.selectList(Wrappers.<SysUserSub>lambdaQuery()
|
|
List<SysUserSub> userSubList = sysUserSubMapper.selectList(Wrappers.<SysUserSub>lambdaQuery()
|
|
.eq(SysUserSub::getGigType, GigTypeEnum.resolve(Integer.parseInt(userDTO.getSubType())))
|
|
.eq(SysUserSub::getGigType, GigTypeEnum.resolve(Integer.parseInt(userDTO.getSubType())))
|
|
- .eq(SysUserSub::getCertStatus, userDTO.getCertStatus()));
|
|
|
|
|
|
+ .eq(SysUserSub::getCertStatus, userDTO.getCertType()));
|
|
if (CollUtil.isNotEmpty(userSubList)) {
|
|
if (CollUtil.isNotEmpty(userSubList)) {
|
|
Set<Integer> certUserIdSet = userSubList.stream().map(SysUserSub::getUserId).collect(Collectors.toSet());
|
|
Set<Integer> certUserIdSet = userSubList.stream().map(SysUserSub::getUserId).collect(Collectors.toSet());
|
|
if (CollUtil.isNotEmpty(userDTO.getUserIdList())) {
|
|
if (CollUtil.isNotEmpty(userDTO.getUserIdList())) {
|