|
@@ -3950,16 +3950,16 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
|
|
|
//查询不同状态下的项目数据
|
|
|
public List<PmDemand> getListByStatus(String projectStatus) {
|
|
|
LambdaQueryWrapper<PmDemand> lw = new LambdaQueryWrapper<PmDemand>();
|
|
|
- // 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) && !SysUser.isAdmin(SecurityUtils.getUserId())) {
|
|
|
- lw.in(PmDemand::getDemandId, list.stream().map(PmAuditDeptRef::getRefId).collect(Collectors.toList()));
|
|
|
+ //需求待提交时不用查审核
|
|
|
+ if (!projectStatus.equals("5")) {
|
|
|
+ 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) && !SysUser.isAdmin(SecurityUtils.getUserId())) {
|
|
|
+ lw.in(PmDemand::getDemandId, list.stream().map(PmAuditDeptRef::getRefId).collect(Collectors.toList()));
|
|
|
+ }
|
|
|
}
|
|
|
lw.eq(PmDemand::getProjectStatus, projectStatus);
|
|
|
lw.eq(PmDemand::getPurchaseDeptId, SecurityUtils.getDeptId());
|