Merge branch 'master' of http://124.70.58.209:3000/ytrd-project-management/purchase

purchase-admin/src/main/java/com/ozs/web/controller/plan/PlanQuarterController.java

@@ -3,12 +3,9 @@ package com.ozs.web.controller.plan;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ozs.common.annotation.Log;
-import com.ozs.common.constant.Constants;
 import com.ozs.common.constant.ModularConstans;
 import com.ozs.common.core.controller.BaseController;
 import com.ozs.common.core.domain.AjaxResult;
-import com.ozs.common.core.domain.entity.SysDept;
-import com.ozs.common.core.domain.entity.SysRole;
 import com.ozs.common.core.domain.model.LoginUser;
 import com.ozs.common.enums.BusinessType;
 import com.ozs.common.enums.DataIsDelete;
@@ -43,7 +40,6 @@ import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * 季度计划信息控制层
@@ -71,7 +67,11 @@ public class PlanQuarterController extends BaseController {
     public AjaxResult list(@RequestBody PlanQuarterStandardVo vo, HttpServletRequest request) {
         List<PlanQuarterResponseVo> planQuarterList = new ArrayList<>();
         try {
+            LoginUser loginUser = tokenService.getLoginUser(request);
             LambdaQueryWrapper<PlanQuarter> lw = new LambdaQueryWrapper<>();
+            if (!loginUser.getUserId().equals(Long.valueOf("1"))) {
+                lw.eq(PlanQuarter::getPurchaseDeptId, loginUser.getDeptId());
+            }
             lw.eq(PlanQuarter::getPlanType, "0");
             lw.eq(PlanQuarter::getDelFlay, DataIsDelete.DataNOTDelete.getCode());
             if (!ObjectUtils.isEmpty(vo.getProjectName())) {
@@ -95,9 +95,6 @@ public class PlanQuarterController extends BaseController {
                 Date parse = dateFormatT.parse(dateFormat.format(vo.getEndTime()) + " 23:59:59:999");
                 lw.le(PlanQuarter::getPlanDemandSubTime, parse);
             }
-
-            LoginUser loginUser = tokenService.getLoginUser(request);
-
             lw.orderBy(true, false, PlanQuarter::getCreateTime);
             List<PlanQuarter> list = quarterService.list(lw);
             planQuarterList = quarterServiceImpl.changeTo(list);

purchase-admin/src/main/java/com/ozs/web/controller/plan/PlanYearsController.java

@@ -3,12 +3,9 @@ package com.ozs.web.controller.plan;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ozs.common.annotation.Log;
-import com.ozs.common.constant.Constants;
 import com.ozs.common.constant.ModularConstans;
 import com.ozs.common.core.controller.BaseController;
 import com.ozs.common.core.domain.AjaxResult;
-import com.ozs.common.core.domain.entity.SysDept;
-import com.ozs.common.core.domain.entity.SysRole;
 import com.ozs.common.core.domain.model.LoginUser;
 import com.ozs.common.enums.BusinessType;
 import com.ozs.common.enums.DataIsDelete;
@@ -43,7 +40,6 @@ import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * 年度计划信息控制层
@@ -73,6 +69,10 @@ public class PlanYearsController extends BaseController {
         List<PlanYearsResponseVo> planYearsList = new ArrayList<>();
         try {
             LambdaQueryWrapper<PlanYears> lw = new LambdaQueryWrapper<PlanYears>();
+            LoginUser loginUser = tokenService.getLoginUser(request);
+            if (!loginUser.getUserId().equals(Long.valueOf("1"))) {
+                lw.eq(PlanYears::getPurchaseDeptId, loginUser.getDeptId());
+            }
             if (!ObjectUtils.isEmpty(vo.getProjectName())) {
                 lw.like(PlanYears::getProjectName, vo.getProjectName());
             }

purchase-admin/src/main/java/com/ozs/web/controller/plan/ProvisionalPlanController.java

@@ -19,7 +19,6 @@ import com.ozs.plan.doman.vo.requestVo.ProvisionalPlanVo;
 import com.ozs.plan.service.ProvisionalPlanService;
 import com.ozs.plan.service.impl.ProvisionalPlanServiceImpl;
 import com.ozs.system.domain.SysFileRef;
-import com.ozs.system.service.ISysDeptService;
 import com.ozs.system.service.SysFileRefService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -38,11 +37,9 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.InputStream;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * 临时计划
@@ -62,8 +59,6 @@ public class ProvisionalPlanController extends BaseController {
     @Autowired
     private TokenService tokenService;
     @Autowired
-    private ISysDeptService iSysDeptService;
-    @Autowired
     private SysFileRefService sysFileRefService;
 
     @ApiOperation(value = "新增临时计划")

purchase-system/src/main/java/com/ozs/plan/service/impl/PlanQuarterServiceImpl.java

@@ -103,6 +103,10 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
             int size = 200;
             while (size == 200) {
                 LambdaQueryWrapper<PlanQuarter> lw = new LambdaQueryWrapper<>();
+                if (!loginUser.getUserId().equals(Long.valueOf("1"))) {
+                    lw.eq(PlanQuarter::getPurchaseDeptId, loginUser.getDeptId());
+                }
+                lw.eq(PlanQuarter::getPlanType, "0");
                 if (!ObjectUtils.isEmpty(vo.getProjectName())) {
                     lw.like(PlanQuarter::getProjectName, vo.getProjectName());
                 }
@@ -122,38 +126,6 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
                     lw.le(PlanQuarter::getPlanDemandSubTime, vo.getEndTime());
                 }
                 lw.eq(PlanQuarter::getDelFlay, DataIsDelete.DataNOTDelete.getCode());
-                // 添加数据权限
-                List<String> roleKeys = loginUser.getUser().getRoles().stream().map(SysRole::getRoleKey).collect(Collectors.toList());
-                if (roleKeys.contains(Constants.DEMAND_UNIT)) {
-                    // 需求单位
-                    /*（purchase_dept_id = 当前用户deptID） */
-                    lw.eq(PlanQuarter::getPurchaseDeptId, loginUser.getDeptId());
-                } else if (roleKeys.contains(Constants.PURCHASING_MANAGEMENT)
-                        || roleKeys.contains(Constants.PURCHASE_SERVICES)) {
-                    // 采购管理部门  或  采购办
-                    SysDept sysDept = new SysDept();
-                    sysDept.setParentId(loginUser.getDeptId());
-                    sysDept.setStatus("0");
-                    List<Long> childDeptIds = deptService.selectDeptList(sysDept)
-                            .stream()
-                            .map(SysDept::getDeptId)
-                            .collect(Collectors.toList());
-                    if (ObjectUtils.isEmpty(childDeptIds)) {
-                        lw.and((wrapper) -> {
-                            wrapper.eq(PlanQuarter::getIsExcess, 0);
-                            wrapper.eq(PlanQuarter::getPurchaseDeptId, loginUser.getDeptId());
-                        });
-                    } else {
-                        lw.and((wrapper) -> {
-                            wrapper.eq(PlanQuarter::getIsExcess, 0);
-                            wrapper.eq(PlanQuarter::getPurchaseDeptId, loginUser.getDeptId());
-                        })
-                                .or((wrapper) -> {
-                                    wrapper.eq(PlanQuarter::getIsExcess, 1);
-                                    wrapper.in(PlanQuarter::getPurchaseDeptId, childDeptIds);
-                                });
-                    }
-                }
                 Page<PlanQuarter> page = planQuarterMapper.selectPage(new Page<>(num, size, false), lw);
                 list.addAll(page.getRecords());
                 size = page.getRecords().size();
@@ -175,6 +147,10 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
             int size = 200;
             while (size == 200) {
                 LambdaQueryWrapper<PlanQuarter> lw = new LambdaQueryWrapper<PlanQuarter>();
+                if (!loginUser.getUserId().equals(Long.valueOf("1"))) {
+                    lw.eq(PlanQuarter::getPurchaseDeptId, loginUser.getDeptId());
+                }
+                lw.eq(PlanQuarter::getPlanType, "0");
                 if (!ObjectUtils.isEmpty(vo.getProjectName())) {
                     lw.like(PlanQuarter::getProjectName, vo.getProjectName());
                 }
@@ -196,38 +172,6 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
                     lw.le(PlanQuarter::getPlanDemandSubTime, vo.getEndTime());
                 }
                 lw.eq(PlanQuarter::getDelFlay, DataIsDelete.DataNOTDelete.getCode());
-                // 添加数据权限
-                List<String> roleKeys = loginUser.getUser().getRoles().stream().map(SysRole::getRoleKey).collect(Collectors.toList());
-                if (roleKeys.contains(Constants.DEMAND_UNIT)) {
-                    // 需求单位
-                    /*（purchase_dept_id = 当前用户deptID） */
-                    lw.eq(PlanQuarter::getPurchaseDeptId, loginUser.getDeptId());
-                } else if (roleKeys.contains(Constants.PURCHASING_MANAGEMENT)
-                        || roleKeys.contains(Constants.PURCHASE_SERVICES)) {
-                    // 采购管理部门  或  采购办
-                    SysDept sysDept = new SysDept();
-                    sysDept.setParentId(loginUser.getDeptId());
-                    sysDept.setStatus("0");
-                    List<Long> childDeptIds = deptService.selectDeptList(sysDept)
-                            .stream()
-                            .map(SysDept::getDeptId)
-                            .collect(Collectors.toList());
-                    if (ObjectUtils.isEmpty(childDeptIds)) {
-                        lw.and((wrapper) -> {
-                            wrapper.eq(PlanQuarter::getIsExcess, 0);
-                            wrapper.eq(PlanQuarter::getPurchaseDeptId, loginUser.getDeptId());
-                        });
-                    } else {
-                        lw.and((wrapper) -> {
-                            wrapper.eq(PlanQuarter::getIsExcess, 0);
-                            wrapper.eq(PlanQuarter::getPurchaseDeptId, loginUser.getDeptId());
-                        })
-                                .or((wrapper) -> {
-                                    wrapper.eq(PlanQuarter::getIsExcess, 1);
-                                    wrapper.in(PlanQuarter::getPurchaseDeptId, childDeptIds);
-                                });
-                    }
-                }
                 Page<PlanQuarter> page = planQuarterMapper.selectPage(new Page<PlanQuarter>(num, size, false), lw);
                 list.addAll(page.getRecords());
                 size = page.getRecords().size();
@@ -438,6 +382,9 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
     @Transactional
     public AjaxResult commit(PlanQuarterStandardVo quarterStandardVo) {
         PlanQuarter byId = planQuarterMapper.getById(quarterStandardVo.getPlanPracticalId());
+        if (!isBetweenValue(byId)) {
+            return AjaxResult.error("所创计划不在提报日期内!");
+        }
         BigDecimal evaluation = byId.getEvaluation();
         SysUser sysUser = userService.selectUserById(SecurityUtils.getUserId());
         Long deptId = sysUser.getDeptId();
@@ -789,5 +736,53 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
         return subTips;
     }
 
+    //是否在提报时间内
+    public Boolean isBetweenValue(PlanQuarter planQuarter) {
+        //获取年度计划提报时间的阈值
+        //获取季度计划各个季度提报时间的阈值
+        List<SysDictData> supTime = dictTypeService.selectDictDataByType("sys_quarterly_plan");
+        HashMap<String, String> thresholdMap = new LinkedHashMap<>();
+        //各个季度提报时间的阈值
+        for (SysDictData dictData : supTime) {
+            //    季度----阈值
+            thresholdMap.put(dictData.getDictLabel(), dictData.getDictValue());
+        }
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+        Date thresholdTimeStart = null;
+        Date thresholdTimeEnd = null;
+        Date subTime = planQuarter.getPlanDemandSubTime();
+        try {
+            for (QuarterEnum val : QuarterEnum.values()) {
+                if (val.getInfo().contains(subTime.getMonth() + "")) {
+                    switch (val.getCode()) {
+                        case "1":
+                            thresholdTimeStart = dateFormat.parse(thresholdMap.get("第一季度开始时间"));
+                            thresholdTimeEnd = dateFormat.parse(thresholdMap.get("第一季度结束时间"));
+                            break;
+                        case "2":
+                            thresholdTimeStart = dateFormat.parse(thresholdMap.get("第二季度开始时间"));
+                            thresholdTimeEnd = dateFormat.parse(thresholdMap.get("第二季度结束时间"));
+                            break;
+                        case "3":
+                            thresholdTimeStart = dateFormat.parse(thresholdMap.get("第三季度开始时间"));
+                            thresholdTimeEnd = dateFormat.parse(thresholdMap.get("第三季度结束时间"));
+                            break;
+                        default:
+                            thresholdTimeStart = dateFormat.parse(thresholdMap.get("第四季度开始时间"));
+                            thresholdTimeEnd = dateFormat.parse(thresholdMap.get("第四季度结束时间"));
+                    }
+                    break;
+                }
+            }
+            if (!ObjectUtils.isEmpty(thresholdTimeStart) && !ObjectUtils.isEmpty(thresholdTimeEnd)) {
+                if (!subTime.after(thresholdTimeStart) && !subTime.before(thresholdTimeEnd)) {
+                    return false;
+                }
+            }
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        return true;
+    }
 
 }

purchase-system/src/main/java/com/ozs/plan/service/impl/PlanYearsServiceImpl.java

@@ -25,7 +25,6 @@ import com.ozs.home.domain.vo.HomeToDoQueryResVo;
 import com.ozs.plan.doman.PlanQuarter;
 import com.ozs.plan.doman.PlanYears;
 import com.ozs.plan.doman.ProvisionalPlan;
-import com.ozs.plan.doman.vo.requestVo.PlanQuarterStandardVo;
 import com.ozs.plan.doman.vo.requestVo.PlanYearsStandardVo;
 import com.ozs.plan.doman.vo.responseVo.PlanQuarterResponseVo;
 import com.ozs.plan.doman.vo.responseVo.PlanYearsResponseVo;
@@ -42,7 +41,6 @@ import com.ozs.system.domain.SysFileRef;
 import com.ozs.system.domain.vo.responseVo.SysDeptResponseVo;
 import com.ozs.system.mapper.SysDeptMapper;
 import com.ozs.system.mapper.SysFileRefMapper;
-import com.ozs.system.mapper.SysProcurementStandardMapper;
 import com.ozs.system.mapper.SysRoleMapper;
 import com.ozs.system.service.*;
 import lombok.extern.slf4j.Slf4j;
@@ -57,7 +55,6 @@ import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Comparator;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
@@ -137,6 +134,9 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
             int size = 200;
             while (size == 200) {
                 LambdaQueryWrapper<PlanYears> lw = new LambdaQueryWrapper<PlanYears>();
+                if (!loginUser.getUserId().equals(Long.valueOf("1"))) {
+                    lw.eq(PlanYears::getPurchaseDeptId, loginUser.getDeptId());
+                }
                 if (!ObjectUtils.isEmpty(vo.getProjectName())) {
                     lw.like(PlanYears::getProjectName, vo.getProjectName());
                 }
@@ -156,10 +156,6 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                     lw.le(PlanYears::getPlanDemandSubTime, vo.getEndTime());
                 }
                 lw.eq(PlanYears::getDelFlay, DataIsDelete.DataNOTDelete.getCode());
-                if (!loginUser.getUserId().equals(Long.valueOf("1"))) {
-                    lw.eq(PlanYears::getPurchaseDeptId, loginUser.getDeptId());
-                }
-
                 Page<PlanYears> page = planYearsMapper.selectPage(new Page<PlanYears>(num, size, false), lw);
                 list.addAll(page.getRecords());
                 size = page.getRecords().size();
@@ -181,6 +177,9 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
             int size = 200;
             while (size == 200) {
                 LambdaQueryWrapper<PlanYears> lw = new LambdaQueryWrapper<PlanYears>();
+                if (!loginUser.getUserId().equals(Long.valueOf("1"))) {
+                    lw.eq(PlanYears::getPurchaseDeptId, loginUser.getDeptId());
+                }
                 if (!ObjectUtils.isEmpty(vo.getProjectName())) {
                     lw.like(PlanYears::getProjectName, vo.getProjectName());
                 }
@@ -202,38 +201,6 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                     lw.le(PlanYears::getPlanDemandSubTime, vo.getEndTime());
                 }
                 lw.eq(PlanYears::getDelFlay, DataIsDelete.DataNOTDelete);
-                // 添加数据权限
-                List<String> roleKeys = loginUser.getUser().getRoles().stream().map(SysRole::getRoleKey).collect(Collectors.toList());
-                if (roleKeys.contains(Constants.DEMAND_UNIT)) {
-                    // 需求单位
-                    /*（purchase_dept_id = 当前用户deptID） */
-                    lw.eq(PlanYears::getPurchaseDeptId, loginUser.getDeptId());
-                } else if (roleKeys.contains(Constants.PURCHASING_MANAGEMENT)
-                        || roleKeys.contains(Constants.PURCHASE_SERVICES)) {
-                    // 采购管理部门  或  采购办
-                    SysDept sysDept = new SysDept();
-                    sysDept.setParentId(loginUser.getDeptId());
-                    sysDept.setStatus("0");
-                    List<Long> childDeptIds = deptService.selectDeptList(sysDept)
-                            .stream()
-                            .map(SysDept::getDeptId)
-                            .collect(Collectors.toList());
-                    if (ObjectUtils.isEmpty(childDeptIds)) {
-                        lw.and((wrapper) -> {
-                            wrapper.eq(PlanYears::getIsExcess, 0);
-                            wrapper.eq(PlanYears::getPurchaseDeptId, loginUser.getDeptId());
-                        });
-                    } else {
-                        lw.and((wrapper) -> {
-                            wrapper.eq(PlanYears::getIsExcess, 0);
-                            wrapper.eq(PlanYears::getPurchaseDeptId, loginUser.getDeptId());
-                        })
-                                .or((wrapper) -> {
-                                    wrapper.eq(PlanYears::getIsExcess, 1);
-                                    wrapper.in(PlanYears::getPurchaseDeptId, childDeptIds);
-                                });
-                    }
-                }
                 Page<PlanYears> page = planYearsMapper.selectPage(new Page<PlanYears>(num, size, false), lw);
                 list.addAll(page.getRecords());
                 size = page.getRecords().size();
@@ -360,6 +327,34 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
         return AjaxResult.success();
     }
 
+    //是否在提报时间内
+    public Boolean isBetweenValue(PlanYears planYear) {
+        //获取年度计划提报时间的阈值
+        List<SysDictData> supTime = dictTypeService.selectDictDataByType("sys_annual_plan");
+        HashMap<String, String> thresholdMap = new LinkedHashMap<>();
+        //年度提报时间的阈值
+        for (SysDictData dictData : supTime) {
+            //    字段名称----阈值
+            thresholdMap.put(dictData.getDictLabel(), dictData.getDictValue());
+        }
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+        Date thresholdTimeStart = null;
+        Date thresholdTimeEnd = null;
+        Date subTime = planYear.getPlanDemandSubTime();
+        try {
+            if (!ObjectUtils.isEmpty(thresholdTimeStart) && !ObjectUtils.isEmpty(thresholdTimeEnd)) {
+                thresholdTimeStart = dateFormat.parse(thresholdMap.get("起止时间开始"));
+                thresholdTimeEnd = dateFormat.parse(thresholdMap.get("起止时间结束"));
+                if (!subTime.after(thresholdTimeStart) && !subTime.before(thresholdTimeEnd)) {
+                    return false;
+                }
+            }
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        return true;
+    }
+
     @Transactional
     @Override
     public String importPlanYears(List<PlanYearsStandardVo> planYears, boolean isUpdateSupport, LoginUser loginUser) {
@@ -446,6 +441,9 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
     @Transactional
     public AjaxResult commit(PlanYearsStandardVo yearsStandardVo) {
         PlanYears byId = planYearsMapper.getById(yearsStandardVo.getPlanYearId());
+        if (!isBetweenValue(byId)) {
+            return AjaxResult.error("所创计划不在提报日期内!");
+        }
         BigDecimal evaluation = byId.getEvaluation();
         SysUser sysUser = userService.selectUserById(SecurityUtils.getUserId());
         Long deptId = sysUser.getDeptId();

purchase-system/src/main/java/com/ozs/plan/service/impl/ProvisionalPlanServiceImpl.java

@@ -24,7 +24,6 @@ import com.ozs.common.utils.PageUtils;
 import com.ozs.common.utils.SecurityUtils;
 import com.ozs.common.utils.StringUtils;
 import com.ozs.common.utils.bean.BeanUtils;
-import com.ozs.plan.doman.MonthlyReconciliation;
 import com.ozs.plan.doman.PlanYears;
 import com.ozs.plan.doman.ProvisionalPlan;
 import com.ozs.plan.doman.vo.requestVo.ProvisionalPlanVo;
@@ -195,6 +194,11 @@ public class ProvisionalPlanServiceImpl extends ServiceImpl<ProvisionalPlanMappe
             while (size == 200) {
                 LambdaQueryWrapper<ProvisionalPlan> lw = new LambdaQueryWrapper<ProvisionalPlan>();
                 lw.eq(ProvisionalPlan::getPlanType, "1");
+                lw.eq(ProvisionalPlan::getDelFlay, DataIsDelete.DataNOTDelete.getCode());
+                if (!loginUser.getUserId().equals(Long.valueOf("1"))) {
+                    lw.eq(ProvisionalPlan::getPurchaseDeptId, loginUser.getDeptId());
+                }
+                lw.eq(ProvisionalPlan::getPlanType, "1");
                 if (!ObjectUtils.isEmpty(vo.getProjectName())) {
                     lw.like(ProvisionalPlan::getProjectName, vo.getProjectName());
                 }
@@ -213,38 +217,7 @@ public class ProvisionalPlanServiceImpl extends ServiceImpl<ProvisionalPlanMappe
                 if (!ObjectUtils.isEmpty(vo.getEndTime())) {
                     lw.le(ProvisionalPlan::getPlanDemandSubTime, vo.getEndTime());
                 }
-                // 添加数据权限
-                List<String> roleKeys = loginUser.getUser().getRoles().stream().map(SysRole::getRoleKey).collect(Collectors.toList());
-                if (roleKeys.contains(Constants.DEMAND_UNIT)) {
-                    // 需求单位
-                    /*（purchase_dept_id = 当前用户deptID） */
-                    lw.eq(ProvisionalPlan::getPurchaseDeptId, loginUser.getDeptId());
-                } else if (roleKeys.contains(Constants.PURCHASING_MANAGEMENT)
-                        || roleKeys.contains(Constants.PURCHASE_SERVICES)) {
-                    // 采购管理部门  或  采购办
-                    SysDept sysDept = new SysDept();
-                    sysDept.setParentId(loginUser.getDeptId());
-                    sysDept.setStatus("0");
-                    List<Long> childDeptIds = deptService.selectDeptList(sysDept)
-                            .stream()
-                            .map(SysDept::getDeptId)
-                            .collect(Collectors.toList());
-                    if (ObjectUtils.isEmpty(childDeptIds)) {
-                        lw.and((wrapper) -> {
-                            wrapper.eq(ProvisionalPlan::getIsExcess, 0);
-                            wrapper.eq(ProvisionalPlan::getPurchaseDeptId, loginUser.getDeptId());
-                        });
-                    } else {
-                        lw.and((wrapper) -> {
-                            wrapper.eq(ProvisionalPlan::getIsExcess, 0);
-                            wrapper.eq(ProvisionalPlan::getPurchaseDeptId, loginUser.getDeptId());
-                        })
-                                .or((wrapper) -> {
-                                    wrapper.eq(ProvisionalPlan::getIsExcess, 1);
-                                    wrapper.in(ProvisionalPlan::getPurchaseDeptId, childDeptIds);
-                                });
-                    }
-                }
+
                 Page<ProvisionalPlan> page = provisionalPlanMapper.selectPage(new Page<ProvisionalPlan>(num, size, false), lw);
                 list.addAll(page.getRecords());
                 size = page.getRecords().size();
@@ -309,6 +282,9 @@ public class ProvisionalPlanServiceImpl extends ServiceImpl<ProvisionalPlanMappe
             LambdaQueryWrapper<ProvisionalPlan> lw = new LambdaQueryWrapper<>();
             lw.eq(ProvisionalPlan::getDelFlay, DataIsDelete.DataNOTDelete.getCode());
             lw.eq(ProvisionalPlan::getPlanType, "1");
+            if (!loginUser.getUserId().equals(Long.valueOf("1"))) {
+                lw.eq(ProvisionalPlan::getPurchaseDeptId, loginUser.getDeptId());
+            }
             if (!ObjectUtils.isEmpty(vo.getProjectName())) {
                 lw.like(ProvisionalPlan::getProjectName, vo.getProjectName());
             }
@@ -330,39 +306,6 @@ public class ProvisionalPlanServiceImpl extends ServiceImpl<ProvisionalPlanMappe
                 Date parse = dateFormatT.parse(dateFormat.format(vo.getEndTime()) + " 23:59:59:999");
                 lw.le(ProvisionalPlan::getPlanDemandSubTime, parse);
             }
-
-            // 添加数据权限
-            List<String> roleKeys = loginUser.getUser().getRoles().stream().map(SysRole::getRoleKey).collect(Collectors.toList());
-            if (roleKeys.contains(Constants.DEMAND_UNIT)) {
-                // 需求单位
-                /*（purchase_dept_id = 当前用户deptID） */
-                lw.eq(ProvisionalPlan::getPurchaseDeptId, loginUser.getDeptId());
-            } else if (roleKeys.contains(Constants.PURCHASING_MANAGEMENT)
-                    || roleKeys.contains(Constants.PURCHASE_SERVICES)) {
-                // 采购管理部门  或  采购办
-                SysDept sysDept = new SysDept();
-                sysDept.setParentId(loginUser.getDeptId());
-                sysDept.setStatus("0");
-                List<Long> childDeptIds = deptService.selectDeptList(sysDept)
-                        .stream()
-                        .map(SysDept::getDeptId)
-                        .collect(Collectors.toList());
-                if (ObjectUtils.isEmpty(childDeptIds)) {
-                    lw.and((wrapper) -> {
-                        wrapper.eq(ProvisionalPlan::getIsExcess, 0);
-                        wrapper.eq(ProvisionalPlan::getPurchaseDeptId, loginUser.getDeptId());
-                    });
-                } else {
-                    lw.and((wrapper) -> {
-                        wrapper.eq(ProvisionalPlan::getIsExcess, 0);
-                        wrapper.eq(ProvisionalPlan::getPurchaseDeptId, loginUser.getDeptId());
-                    })
-                            .or((wrapper) -> {
-                                wrapper.eq(ProvisionalPlan::getIsExcess, 1);
-                                wrapper.in(ProvisionalPlan::getPurchaseDeptId, childDeptIds);
-                            });
-                }
-            }
             lw.orderBy(true, false, ProvisionalPlan::getCreateTime);
             List<ProvisionalPlan> list = provisionalPlanMapper.selectList(lw);
             provisionalPlanList = changeTo(list);
@@ -388,6 +331,9 @@ public class ProvisionalPlanServiceImpl extends ServiceImpl<ProvisionalPlanMappe
             LambdaQueryWrapper<ProvisionalPlan> lw = new LambdaQueryWrapper<>();
             lw.eq(ProvisionalPlan::getDelFlay, DataIsDelete.DataNOTDelete.getCode());
             lw.eq(ProvisionalPlan::getPlanType, "1");
+            if (!loginUser.getUserId().equals(Long.valueOf("1"))) {
+                lw.eq(ProvisionalPlan::getPurchaseDeptId, loginUser.getDeptId());
+            }
             if (!ObjectUtils.isEmpty(vo.getProjectName())) {
                 lw.like(ProvisionalPlan::getProjectName, vo.getProjectName());
             }
@@ -411,38 +357,7 @@ public class ProvisionalPlanServiceImpl extends ServiceImpl<ProvisionalPlanMappe
                 Date parse = dateFormatT.parse(dateFormat.format(vo.getEndTime()) + " 23:59:59:999");
                 lw.le(ProvisionalPlan::getPlanDemandSubTime, parse);
             }
-            // 添加数据权限
-            List<String> roleKeys = loginUser.getUser().getRoles().stream().map(SysRole::getRoleKey).collect(Collectors.toList());
-            if (roleKeys.contains(Constants.DEMAND_UNIT)) {
-                // 需求单位
-                /*（purchase_dept_id = 当前用户deptID） */
-                lw.eq(ProvisionalPlan::getPurchaseDeptId, loginUser.getDeptId());
-            } else if (roleKeys.contains(Constants.PURCHASING_MANAGEMENT)
-                    || roleKeys.contains(Constants.PURCHASE_SERVICES)) {
-                // 采购管理部门  或  采购办
-                SysDept sysDept = new SysDept();
-                sysDept.setParentId(loginUser.getDeptId());
-                sysDept.setStatus("0");
-                List<Long> childDeptIds = deptService.selectDeptList(sysDept)
-                        .stream()
-                        .map(SysDept::getDeptId)
-                        .collect(Collectors.toList());
-                if (ObjectUtils.isEmpty(childDeptIds)) {
-                    lw.and((wrapper) -> {
-                        wrapper.eq(ProvisionalPlan::getIsExcess, 0);
-                        wrapper.eq(ProvisionalPlan::getPurchaseDeptId, loginUser.getDeptId());
-                    });
-                } else {
-                    lw.and((wrapper) -> {
-                        wrapper.eq(ProvisionalPlan::getIsExcess, 0);
-                        wrapper.eq(ProvisionalPlan::getPurchaseDeptId, loginUser.getDeptId());
-                    })
-                            .or((wrapper) -> {
-                                wrapper.eq(ProvisionalPlan::getIsExcess, 1);
-                                wrapper.in(ProvisionalPlan::getPurchaseDeptId, childDeptIds);
-                            });
-                }
-            }
+
             lw.orderBy(true, false, ProvisionalPlan::getCreateTime);
             List<ProvisionalPlan> list = provisionalPlanMapper.selectList(lw);
             provisionalPlanList = changeTo(list);