mirror of
http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git
synced 2026-08-14 05:42:06 +08:00
处理用户分页查询sql ,or连接异常
This commit is contained in:
+12
-5
@@ -14,6 +14,7 @@ import org.apache.ibatis.annotations.Mapper;
|
|||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
|
import java.util.function.Consumer;
|
||||||
|
|
||||||
@Mapper
|
@Mapper
|
||||||
public interface AdminUserMapper extends BaseMapperX<AdminUserDO> {
|
public interface AdminUserMapper extends BaseMapperX<AdminUserDO> {
|
||||||
@@ -50,11 +51,17 @@ public interface AdminUserMapper extends BaseMapperX<AdminUserDO> {
|
|||||||
.eqIfPresent(AdminUserDO::getStatus, reqVO.getStatus())
|
.eqIfPresent(AdminUserDO::getStatus, reqVO.getStatus())
|
||||||
.betweenIfPresent(AdminUserDO::getCreateTime, reqVO.getCreateTime())
|
.betweenIfPresent(AdminUserDO::getCreateTime, reqVO.getCreateTime())
|
||||||
.inIfPresent(AdminUserDO::getDeptId, deptIds)
|
.inIfPresent(AdminUserDO::getDeptId, deptIds)
|
||||||
.likeIfPresent(AdminUserDO::getNickname, reqVO.getNickname())
|
.and(StrUtil.isNotBlank(reqVO.getNickname()), wrapper -> {
|
||||||
.or(StrUtil.isNotBlank(reqVO.getNickname()))
|
if (StrUtil.isNotBlank(reqVO.getPyAll())) {
|
||||||
.likeIfPresent(AdminUserDO::getPinyinFull, reqVO.getPyAll())
|
wrapper.or(Boolean.TRUE).like(AdminUserDO::getPinyinFull, reqVO.getPyAll()) ;
|
||||||
.or(StrUtil.isNotBlank(reqVO.getNickname()))
|
}
|
||||||
.likeIfPresent(AdminUserDO::getPinyinInitial, reqVO.getPyFirstChar())
|
if (StrUtil.isNotBlank(reqVO.getPyFirstChar())) {
|
||||||
|
wrapper.or(Boolean.TRUE).like(AdminUserDO::getPinyinInitial, reqVO.getPyFirstChar()) ;
|
||||||
|
}
|
||||||
|
if(StrUtil.isNotBlank(reqVO.getNickname())) {
|
||||||
|
wrapper.or(Boolean.TRUE).like(AdminUserDO::getNickname, reqVO.getNickname()) ;
|
||||||
|
}
|
||||||
|
})
|
||||||
.orderByDesc(AdminUserDO::getId));
|
.orderByDesc(AdminUserDO::getId));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user