|
|
@@ -95,7 +95,7 @@ public class MaterialTaskController {
|
|
|
.like(StrUtil.isNotBlank(dto.getName()), MaterialTask::getName, dto.getName())
|
|
|
.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())
|
|
|
+ .eq(!roleIds.contains(GlobalConstant.SUPER_ADMIN_ROLE_ID), MaterialTask::getCreateUserId, StpUtil.getLoginIdAsLong())
|
|
|
.gt(dto.getCreateDateStart() != null, MaterialTask::getCreateDate, dto.getCreateDateStart())
|
|
|
.lt(dto.getCreateDateEnd() != null, MaterialTask::getCreateDate, dto.getCreateDateEnd())
|
|
|
.select(MaterialTask::getId)
|