|
@@ -778,10 +778,7 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
|
|
|
l.eq(PmAuditDeptRef::getRefType, "2");
|
|
|
list = pmAuditDeptRefService.list(l);
|
|
|
if (!pmDemandReqVo.getIsAdmin()) {
|
|
|
- if (!ObjectUtils.isEmpty(list)) {
|
|
|
-
|
|
|
- lw.in(PmDemand::getDemandId, list.stream().map(PmAuditDeptRef::getRefId).collect(Collectors.toSet()));
|
|
|
- }
|
|
|
+ lw.eq(PmDemand::getCreateBy, SecurityUtils.getUserId());
|
|
|
}
|
|
|
|
|
|
if (!StringUtils.isBlank(pmDemandReqVo.getProjectName())) {
|
|
@@ -805,7 +802,6 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
|
|
|
if (!StringUtils.isBlank(pmDemandReqVo.getEndDate())) {
|
|
|
lw.apply("(plan_demand_sub_time <= '" + pmDemandReqVo.getEndDate() + "' or plan_purchase_finish_time <= '" + pmDemandReqVo.getEndDate() + "' or plan_deliver_time <= '" + pmDemandReqVo.getEndDate() + "' )");
|
|
|
}
|
|
|
- lw.apply("(project_status >=6 )");
|
|
|
|
|
|
lw.last(" order by project_status, plan_demand_sub_time");
|
|
|
List<PmDemand> demandList = pmDemandMapper.selectList(lw);
|