|
|
|
@ -6,6 +6,7 @@ import com.chanko.yunxi.mes.framework.mybatis.core.query.LambdaQueryWrapperX;
|
|
|
|
|
import com.chanko.yunxi.mes.module.system.controller.admin.user.vo.user.UserPageReqVO;
|
|
|
|
|
import com.chanko.yunxi.mes.module.system.dal.dataobject.user.AdminUserDO;
|
|
|
|
|
import org.apache.ibatis.annotations.Mapper;
|
|
|
|
|
import org.springframework.util.StringUtils;
|
|
|
|
|
|
|
|
|
|
import java.util.Collection;
|
|
|
|
|
import java.util.List;
|
|
|
|
@ -26,14 +27,18 @@ public interface AdminUserMapper extends BaseMapperX<AdminUserDO> {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
default PageResult<AdminUserDO> selectPage(UserPageReqVO reqVO, Collection<Long> deptIds) {
|
|
|
|
|
return selectPage(reqVO, new LambdaQueryWrapperX<AdminUserDO>()
|
|
|
|
|
LambdaQueryWrapperX<AdminUserDO> query = new LambdaQueryWrapperX<AdminUserDO>()
|
|
|
|
|
.likeIfPresent(AdminUserDO::getUsername, reqVO.getUsername())
|
|
|
|
|
.likeIfPresent(AdminUserDO::getNickname, reqVO.getNickname())
|
|
|
|
|
.likeIfPresent(AdminUserDO::getMobile, reqVO.getMobile())
|
|
|
|
|
.eqIfPresent(AdminUserDO::getStatus, reqVO.getStatus())
|
|
|
|
|
.betweenIfPresent(AdminUserDO::getCreateTime, reqVO.getCreateTime())
|
|
|
|
|
.inIfPresent(AdminUserDO::getDeptId, deptIds)
|
|
|
|
|
.orderByDesc(AdminUserDO::getId));
|
|
|
|
|
.orderByDesc(AdminUserDO::getId);
|
|
|
|
|
if(!StringUtils.isEmpty(reqVO.getUserNickName())){
|
|
|
|
|
query.like(AdminUserDO::getUsername, reqVO.getUserNickName()).or().like(AdminUserDO::getNickname, reqVO.getUserNickName());
|
|
|
|
|
}
|
|
|
|
|
return selectPage(reqVO, query);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
default List<AdminUserDO> selectListByNickname(String nickname) {
|
|
|
|
|