|
@@ -168,7 +168,7 @@ public class PlanServiceImpl extends ServiceImpl<PlanMapper, Plan> implements Pl
|
|
}
|
|
}
|
|
collect.add(-1);
|
|
collect.add(-1);
|
|
List<Integer> finalCollect = collect;
|
|
List<Integer> finalCollect = collect;
|
|
- queryWrapper.and(wrapper->wrapper.in(Plan::getId, finalCollect).or().eq(Plan::getCreateId,user.getId()));
|
|
|
|
|
|
+ queryWrapper.and(wrapper->wrapper.in(Plan::getId, finalCollect).or().eq(Plan::getCreateId,user.getId())).eq(Plan::getStatus,1);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
if(!StringUtils.isEmpty(steelStampNumber)){
|
|
if(!StringUtils.isEmpty(steelStampNumber)){
|