|
@@ -104,7 +104,6 @@ public class WfTextbookClaimServiceImpl extends MPJBaseServiceImpl<WfTextbookCla
|
|
|
.eq(WfTextbookClaim::getBaseSemesterId, dto.getBaseSemesterId())
|
|
.eq(WfTextbookClaim::getBaseSemesterId, dto.getBaseSemesterId())
|
|
|
.eq(StringUtils.isNotEmpty(dto.getClaimType()), WfTextbookClaim::getClaimType, dto.getClaimType())
|
|
.eq(StringUtils.isNotEmpty(dto.getClaimType()), WfTextbookClaim::getClaimType, dto.getClaimType())
|
|
|
.eq(ObjectUtils.isNotEmpty(dto.getDistributeStatus()), WfTextbookClaim::getStatus, dto.getDistributeStatus())
|
|
.eq(ObjectUtils.isNotEmpty(dto.getDistributeStatus()), WfTextbookClaim::getStatus, dto.getDistributeStatus())
|
|
|
- .ne(ObjectUtils.isEmpty(dto.getDistributeStatus()), WfTextbookClaim::getStatus, 1)
|
|
|
|
|
.and(StringUtils.isNotEmpty(dto.getName()),
|
|
.and(StringUtils.isNotEmpty(dto.getName()),
|
|
|
wrapper -> wrapper
|
|
wrapper -> wrapper
|
|
|
.like(XjrUser::getName, dto.getName())
|
|
.like(XjrUser::getName, dto.getName())
|