|
|
@@ -3896,15 +3896,15 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
|
|
|
// 4 (合同信息管理)、 0(需求单位管理) 、 5(项目建设管理) 需求单位
|
|
|
// 1(需求需求审核) 、2 (任务下达管理) 采购管理部门
|
|
|
// 3(采购执行管理) 采购办
|
|
|
- List<PmAuditDeptRef> list = new ArrayList<>();
|
|
|
- LambdaQueryWrapper<PmAuditDeptRef> l = new LambdaQueryWrapper<>();
|
|
|
- l.eq(PmAuditDeptRef::getDeptId, SecurityUtils.getDeptId());
|
|
|
- l.eq(PmAuditDeptRef::getRefType, "2");
|
|
|
- list = pmAuditDeptRefService.list(l);
|
|
|
- if (!ObjectUtils.isEmpty(list) && !SecurityUtils.getUserId().equals(Integer.parseInt("1"))) {
|
|
|
- lw.in(PmDemand::getDemandId, list.stream().map(PmAuditDeptRef::getRefId).collect(Collectors.toList()));
|
|
|
- }
|
|
|
- lw.eq(PmDemand::getProjectStatus, projectStatus);
|
|
|
+ //List<PmAuditDeptRef> list = new ArrayList<>();
|
|
|
+ //LambdaQueryWrapper<PmAuditDeptRef> l = new LambdaQueryWrapper<>();
|
|
|
+ //l.eq(PmAuditDeptRef::getDeptId, SecurityUtils.getDeptId());
|
|
|
+ //l.eq(PmAuditDeptRef::getRefType, "2");
|
|
|
+ //list = pmAuditDeptRefService.list(l);
|
|
|
+ //if (!ObjectUtils.isEmpty(list) && !SecurityUtils.getUserId().equals(Integer.parseInt("1"))) {
|
|
|
+ // lw.in(PmDemand::getDemandId, list.stream().map(PmAuditDeptRef::getRefId).collect(Collectors.toList()));
|
|
|
+ //}
|
|
|
+ lw.eq(PmDemand::getPurchaseDeptId, SecurityUtils.getDeptId());
|
|
|
lw.last(" order by project_status, plan_demand_sub_time");
|
|
|
List<PmDemand> demandList = this.baseMapper.selectList(lw);
|
|
|
|
buzhanyi