purchase

purchase-admin/src/main/java/com/ozs/web/controller/pm/PmContractInfoController.java

@@ -6,6 +6,7 @@ import com.ozs.common.annotation.Log;
 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.SysUser;
 import com.ozs.common.enums.BusinessType;
 import com.ozs.common.enums.PmProjectStatus;
 import com.ozs.common.enums.SysFileRefEnum;
@@ -56,7 +57,10 @@ public class PmContractInfoController extends BaseController {
     @PreAuthorize("@ss.hasPermi('pm:contractInfo:list')")
     @Log(title = ModularConstans.contractInfo, businessType = BusinessType.QUERY)
     public AjaxResult list(@RequestBody PmDemandReqVo pmDemandReqVo) {
-        IPage<PmDemandResVo> page  = pmDemandService.selectPmDemandList(pmDemandReqVo,4);
+        pmDemandReqVo.setIsAdmin(SysUser.isAdmin(getUserId()));
+        pmDemandReqVo.setDeptId(getDeptId());
+        pmDemandReqVo.setUserId(getUserId());
+        IPage<PmDemandResVo> page = pmDemandService.selectPmDemandList(pmDemandReqVo, 4);
         return success(page);
     }
 

purchase-admin/src/main/java/com/ozs/web/controller/pm/PmDemandController.java

@@ -165,6 +165,9 @@ public class PmDemandController extends BaseController {
     @PreAuthorize("@ss.hasPermi('pm:examine:list')")
     @Log(title = ModularConstans.demandExamine, businessType = BusinessType.QUERY)
     public AjaxResult examineList(@RequestBody PmDemandReqVo pmDemandReqVo) {
+        pmDemandReqVo.setIsAdmin(SysUser.isAdmin(getUserId()));
+        pmDemandReqVo.setDeptId(getDeptId());
+        pmDemandReqVo.setUserId(getUserId());
         IPage<PmDemandResVo> page = pmDemandService.selectPmDemandList(pmDemandReqVo, 1);
         return success(page);
     }

purchase-admin/src/main/java/com/ozs/web/controller/pm/PmProjectConstructionController.java

@@ -6,6 +6,7 @@ import com.ozs.common.annotation.Log;
 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.SysUser;
 import com.ozs.common.enums.BusinessType;
 import com.ozs.common.enums.PmProjectStatus;
 import com.ozs.common.enums.SysFileRefEnum;
@@ -54,7 +55,10 @@ public class PmProjectConstructionController extends BaseController {
     @PreAuthorize("@ss.hasPermi('pm:projectConstruction:list')")
     @Log(title = ModularConstans.projectConstruction, businessType = BusinessType.QUERY)
     public AjaxResult list(@RequestBody PmDemandReqVo pmDemandReqVo) {
-        IPage<PmDemandResVo> page  = pmDemandService.selectPmDemandList(pmDemandReqVo,5);
+        pmDemandReqVo.setIsAdmin(SysUser.isAdmin(getUserId()));
+        pmDemandReqVo.setDeptId(getDeptId());
+        pmDemandReqVo.setUserId(getUserId());
+        IPage<PmDemandResVo> page = pmDemandService.selectPmDemandList(pmDemandReqVo, 5);
         return success(page);
     }
 

purchase-admin/src/main/java/com/ozs/web/controller/pm/PmPurchaseExecutionController.java

@@ -16,6 +16,7 @@ import com.ozs.common.annotation.Log;
 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.SysUser;
 import com.ozs.common.enums.*;
 import com.ozs.common.utils.RandomUtil;
 import com.ozs.common.utils.StringUtils;
@@ -74,7 +75,10 @@ public class PmPurchaseExecutionController extends BaseController {
     @PreAuthorize("@ss.hasPermi('pm:purchaseExecution:list')")
     @Log(title = ModularConstans.purchaseExecution, businessType = BusinessType.QUERY)
     public AjaxResult list(@RequestBody PmDemandReqVo pmDemandReqVo) {
-        IPage<PmDemandResVo> page  = pmDemandService.selectPmDemandList(pmDemandReqVo,3);
+        pmDemandReqVo.setIsAdmin(SysUser.isAdmin(getUserId()));
+        pmDemandReqVo.setDeptId(getDeptId());
+        pmDemandReqVo.setUserId(getUserId());
+        IPage<PmDemandResVo> page = pmDemandService.selectPmDemandList(pmDemandReqVo, 3);
         return success(page);
     }
 

purchase-admin/src/main/java/com/ozs/web/controller/pm/PmTaskReleaseController.java

@@ -6,6 +6,7 @@ import com.ozs.common.annotation.Log;
 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.SysUser;
 import com.ozs.common.core.domain.model.LoginUser;
 import com.ozs.common.enums.BusinessType;
 import com.ozs.common.utils.StringUtils;
@@ -48,7 +49,10 @@ public class PmTaskReleaseController extends BaseController {
     @PreAuthorize("@ss.hasPermi('pm:taskRelease:list')")
     @Log(title = ModularConstans.taskRelease, businessType = BusinessType.QUERY)
     public AjaxResult list(@RequestBody PmDemandReqVo pmDemandReqVo) {
-        IPage<PmDemandResVo> page  = pmDemandService.selectPmDemandList(pmDemandReqVo,2);
+        pmDemandReqVo.setIsAdmin(SysUser.isAdmin(getUserId()));
+        pmDemandReqVo.setDeptId(getDeptId());
+        pmDemandReqVo.setUserId(getUserId());
+        IPage<PmDemandResVo> page = pmDemandService.selectPmDemandList(pmDemandReqVo, 2);
         return success(page);
     }
 

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

@@ -604,14 +604,19 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
                     List<PmAuditDeptRef> collect = list.stream()
                             .filter(f -> f.getDeptId().equals(Long.valueOf(vo.getPurchaseDeptId())))
                             .collect(Collectors.toList());
-                    String deptLevel = collect.get(0).getDeptLevel();
-                    fl = collect.get(0).getStatus().equals(Integer.parseInt("1")) ? false : true;
-                    for (PmAuditDeptRef pmAuditDeptRef : list) {
-                        if (pmAuditDeptRef.getDeptLevel().compareTo(deptLevel) == -1
-                                && pmAuditDeptRef.getStatus().equals(Integer.parseInt("0"))) {
-                            fl = false;
+                    if (ObjectUtils.isEmpty(collect)) {
+                        fl = false;
+                    } else {
+                        String deptLevel = collect.get(0).getDeptLevel();
+                        fl = collect.get(0).getStatus().equals(Integer.parseInt("1")) ? false : true;
+                        for (PmAuditDeptRef pmAuditDeptRef : list) {
+                            if (pmAuditDeptRef.getDeptLevel().compareTo(deptLevel) == -1
+                                    && pmAuditDeptRef.getStatus().equals(Integer.parseInt("0"))) {
+                                fl = false;
+                            }
                         }
                     }
+
                     /*
                     *  String s1="A";
                         String s2="B";

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

@@ -841,6 +841,8 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
         pmDemandReqVo.setPageNum(1L);
         pmDemandReqVo.setPageSize(10L);
         pmDemandReqVo.setUserId(sysUser.getUserId());
+        pmDemandReqVo.setIsAdmin(SysUser.isAdmin(sysUser.getUserId()));
+        pmDemandReqVo.setDeptId(sysDept.getDeptId());
         pmDemandReqVo.setPurchaseDeptId(Math.toIntExact(sysDept.getDeptId()));
         IPage<PmDemandResVo> page = pmDemandService.selectPmDemandList(pmDemandReqVo, 3);
         return AjaxResult.success(page.getTotal());
@@ -1244,16 +1246,21 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                     List<PmAuditDeptRef> collect = list.stream()
                             .filter(f -> f.getDeptId().equals(Long.valueOf(vo.getPurchaseDeptId())))
                             .collect(Collectors.toList());
-                    String deptLevel = collect.get(0).getDeptLevel();
+                    if (ObjectUtils.isEmpty(collect)) {
+                        fl = false;
+                    } else {
+                        String deptLevel = collect.get(0).getDeptLevel();
 
-                    fl = collect.get(0).getStatus().equals(Integer.parseInt("1")) ? false : true;
+                        fl = collect.get(0).getStatus().equals(Integer.parseInt("1")) ? false : true;
 
-                    for (PmAuditDeptRef pmAuditDeptRef : list) {
-                        if (pmAuditDeptRef.getDeptLevel().compareTo(deptLevel) == -1
-                                && pmAuditDeptRef.getStatus().equals(Integer.parseInt("0"))) {
-                            fl = false;
+                        for (PmAuditDeptRef pmAuditDeptRef : list) {
+                            if (pmAuditDeptRef.getDeptLevel().compareTo(deptLevel) == -1
+                                    && pmAuditDeptRef.getStatus().equals(Integer.parseInt("0"))) {
+                                fl = false;
+                            }
                         }
                     }
+
                     /*
                     *  String s1="A";
                         String s2="B";

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

@@ -519,15 +519,20 @@ public class ProvisionalPlanServiceImpl extends ServiceImpl<ProvisionalPlanMappe
                     List<PmAuditDeptRef> collect = list.stream()
                             .filter(f -> f.getDeptId().equals(Long.valueOf(vo.getPurchaseDeptId())))
                             .collect(Collectors.toList());
-                    String deptLevel = collect.get(0).getDeptLevel();
+                    if (ObjectUtils.isEmpty(collect)) {
+                        fl = false;
+                    } else {
+                        String deptLevel = collect.get(0).getDeptLevel();
 
-                    fl = collect.get(0).getStatus().equals(Integer.parseInt("1")) ? false : true;
-                    for (PmAuditDeptRef pmAuditDeptRef : list) {
-                        if (pmAuditDeptRef.getDeptLevel().compareTo(deptLevel) == -1
-                                && pmAuditDeptRef.getStatus().equals(Integer.parseInt("0"))) {
-                            fl = false;
+                        fl = collect.get(0).getStatus().equals(Integer.parseInt("1")) ? false : true;
+                        for (PmAuditDeptRef pmAuditDeptRef : list) {
+                            if (pmAuditDeptRef.getDeptLevel().compareTo(deptLevel) == -1
+                                    && pmAuditDeptRef.getStatus().equals(Integer.parseInt("0"))) {
+                                fl = false;
+                            }
                         }
                     }
+
                     /*
                     *  String s1="A";
                         String s2="B";