|
|
@@ -96,8 +96,8 @@ public class MaterialTaskController {
|
|
|
.eq((ObjectUtil.isNotEmpty(dto.getMaterialTypeId())) && dto.getMaterialTypeId() > 0, MaterialTask::getMaterialTypeId, dto.getMaterialTypeId())
|
|
|
.eq((ObjectUtil.isNotEmpty(dto.getStatus())) && dto.getStatus() > 0, MaterialTask::getStatus, dto.getStatus())
|
|
|
.eq(!roleIds.contains(GlobalConstant.SUPER_ADMIN_ROLE_ID), MaterialType::getCreateUserId, StpUtil.getLoginIdAsLong())
|
|
|
- .gt(dto.getCreateDateStart() != null && !dto.getCreateDateStart().equals(""), MaterialTask::getCreateDate, dto.getCreateDateStart())
|
|
|
- .lt(dto.getCreateDateEnd() != null && !dto.getCreateDateEnd().equals(""), MaterialTask::getCreateDate, dto.getCreateDateEnd())
|
|
|
+ .gt(dto.getCreateDateStart() != null, MaterialTask::getCreateDate, dto.getCreateDateStart())
|
|
|
+ .lt(dto.getCreateDateEnd() != null, MaterialTask::getCreateDate, dto.getCreateDateEnd())
|
|
|
.select(MaterialTask::getId)
|
|
|
.selectAs(MaterialType::getName, MaterialTaskPageVo::getMaterialTypeIdCn)
|
|
|
.selectAs(MaterialType::getCreateDate, MaterialTaskPageVo::getCreateDate)
|
