瀏覽代碼

Merge remote-tracking branch 'origin/master'

buzhanyi 2 年之前
父節點
當前提交
398ba41535
共有 1 個文件被更改,包括 1 次插入1 次删除
  1. 1 1
      purchase-system/src/main/java/com/ozs/pm/service/impl/PmDemandServiceImpl.java

+ 1 - 1
purchase-system/src/main/java/com/ozs/pm/service/impl/PmDemandServiceImpl.java

@@ -388,7 +388,7 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
         l.eq(PmAuditDeptRef::getDeptId, pmDemandReqVo.getDeptId());
         l.eq(PmAuditDeptRef::getDeptId, pmDemandReqVo.getDeptId());
         l.eq(PmAuditDeptRef::getRefType, "2");
         l.eq(PmAuditDeptRef::getRefType, "2");
         List<PmAuditDeptRef> list = pmAuditDeptRefService.list(l);
         List<PmAuditDeptRef> list = pmAuditDeptRefService.list(l);
-        if (!ObjectUtils.isEmpty(list)) {
+        if (!ObjectUtils.isEmpty(list) && !pmDemandReqVo.getUserId().equals(Integer.parseInt("1"))) {
             lw.in(PmDemand::getDemandId, list.stream().map(PmAuditDeptRef::getRefId).collect(Collectors.toList()));
             lw.in(PmDemand::getDemandId, list.stream().map(PmAuditDeptRef::getRefId).collect(Collectors.toList()));
         }
         }