|
@@ -55,8 +55,10 @@ public class MarkingServiceImpl extends ServiceImpl<IMarkingMapper, Marking> imp
|
|
|
VUtils.isTure(param.getProjectId() == null).throwMessage(ResultCode.PARAM_MISS);
|
|
|
MPJLambdaWrapper<Marking> wrapper = new MPJLambdaWrapper<Marking>()
|
|
|
.selectAll(Marking.class)
|
|
|
- .eq(Marking::getProjectId,param.getProjectId())
|
|
|
- .eq(Marking::getNum,param.getNum());
|
|
|
+ .eq(Marking::getProjectId,param.getProjectId());
|
|
|
+ if (Optional.ofNullable(param.getNum()).isPresent()) {
|
|
|
+ wrapper.eq(Marking::getNum,param.getNum());
|
|
|
+ }
|
|
|
if (Optional.ofNullable(param.getMarkingStatus()).isPresent()) {
|
|
|
wrapper.eq(Marking::getMarkingStatus,param.getMarkingStatus());
|
|
|
}
|