DeBugDeBugDeBug

purchase-system/src/main/java/com/ozs/pm/service/IPmDemandService.java

@@ -189,14 +189,14 @@ public interface IPmDemandService extends IService<PmDemand> {
 
 
     /**
-     * 采购管理部门首页待办事项（全部）
+     * 采购办首页待办事项（全部）
      *
      * @return
      */
     AjaxResult procurementOfficeWillManipulateTotal();
 
     /**
-     * 采购管理部门首页待办事项（数量）
+     * 采购办首页待办事项（数量）
      *
      * @return
      */

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

@@ -576,7 +576,7 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
         list = pmAuditDeptRefService.list(l);
         if (!pmDemandReqVo.getIsAdmin()) {
             if (Arrays.asList(1, 2, 3).contains(reqType)) {
-                if (!ObjectUtils.isEmpty(list) && !SysUser.isAdmin(SecurityUtils.getUserId())) {
+                if (!ObjectUtils.isEmpty(list)) {
                     lw.in(PmDemand::getDemandId, list.stream().map(PmAuditDeptRef::getRefId).collect(Collectors.toList()));
                 }
                 lw.eq(PmDemand::getPurchaseDeptId, SecurityUtils.getDeptId());
@@ -1823,7 +1823,7 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
 
     @Override
     public List<PmDemandResVo> procurementDocumentsReview() {
-        return getListByStatus(PmProjectStatus.PROCUREMENT_DOCUMENTS_REVIEW.getInfo());
+        return getListByStatus(PmProjectStatus.PROCUREMENT_DOCUMENTS_REVIEW.getCode());
     }
 
     @Override
@@ -3892,7 +3892,6 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
     //查询不同状态下的项目数据
     public List<PmDemandResVo> getListByStatus(String projectStatus) {
         LambdaQueryWrapper<PmDemand> lw = new LambdaQueryWrapper<PmDemand>();
-        lw.eq(PmDemand::getProjectStatus, projectStatus);
         //  4 (合同信息管理)、 0(需求单位管理) 、 5(项目建设管理)  需求单位
         //  1(需求需求审核) 、2 (任务下达管理)      采购管理部门
         //  3(采购执行管理)   采购办
@@ -3908,7 +3907,6 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
         lw.eq(PmDemand::getPurchaseDeptId, SecurityUtils.getDeptId());
         lw.last(" order by project_status, plan_demand_sub_time");
         List<PmDemand> demandList = this.baseMapper.selectList(lw);
-
         //数据转换
         List<PmDemandResVo> pmDemandResponseVoList = new ArrayList<>();
         if (!ObjectUtils.isEmpty(demandList) && demandList.size() > 0) {