|
@@ -3871,7 +3871,7 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
|
|
if (!ObjectUtils.isEmpty(list) && !SysUser.isAdmin(SecurityUtils.getUserId())) {
|
|
if (!ObjectUtils.isEmpty(list) && !SysUser.isAdmin(SecurityUtils.getUserId())) {
|
|
lw.in(PmDemand::getDemandId, list.stream().map(PmAuditDeptRef::getRefId).collect(Collectors.toList()));
|
|
lw.in(PmDemand::getDemandId, list.stream().map(PmAuditDeptRef::getRefId).collect(Collectors.toList()));
|
|
}
|
|
}
|
|
- l.eq(PmAuditDeptRef::getStatus, projectStatus);
|
|
|
|
|
|
+ lw.eq(PmDemand::getProjectStatus, projectStatus);
|
|
lw.eq(PmDemand::getPurchaseDeptId, SecurityUtils.getDeptId());
|
|
lw.eq(PmDemand::getPurchaseDeptId, SecurityUtils.getDeptId());
|
|
lw.last(" order by project_status, plan_demand_sub_time");
|
|
lw.last(" order by project_status, plan_demand_sub_time");
|
|
List<PmDemand> demandList = this.baseMapper.selectList(lw);
|
|
List<PmDemand> demandList = this.baseMapper.selectList(lw);
|
|
@@ -3897,7 +3897,7 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
|
|
if (!ObjectUtils.isEmpty(list) && !SysUser.isAdmin(SecurityUtils.getUserId())) {
|
|
if (!ObjectUtils.isEmpty(list) && !SysUser.isAdmin(SecurityUtils.getUserId())) {
|
|
lw.in(PmDemand::getDemandId, list.stream().map(PmAuditDeptRef::getRefId).collect(Collectors.toList()));
|
|
lw.in(PmDemand::getDemandId, list.stream().map(PmAuditDeptRef::getRefId).collect(Collectors.toList()));
|
|
}
|
|
}
|
|
- l.eq(PmAuditDeptRef::getStatus, projectStatus);
|
|
|
|
|
|
+ lw.eq(PmDemand::getProjectStatus, projectStatus);
|
|
lw.eq(PmDemand::getPurchaseDeptId, SecurityUtils.getDeptId());
|
|
lw.eq(PmDemand::getPurchaseDeptId, SecurityUtils.getDeptId());
|
|
lw.last(" order by project_status, plan_demand_sub_time");
|
|
lw.last(" order by project_status, plan_demand_sub_time");
|
|
Long count = this.baseMapper.selectCount(lw);
|
|
Long count = this.baseMapper.selectCount(lw);
|