purchase

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

@@ -4,6 +4,7 @@ package com.ozs.web.controller.pm;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.ozs.common.annotation.Log;
 import com.ozs.common.constant.ModularConstans;
+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;
@@ -53,6 +54,7 @@ public class PmDemandController extends BaseController {
     @Log(title = ModularConstans.demand, businessType = BusinessType.QUERY)
     public AjaxResult list(@RequestBody PmDemandReqVo pmDemandReqVo) {
         pmDemandReqVo.setDeptId(getDeptId());
+        pmDemandReqVo.setIsAdmin(SysUser.isAdmin(getUserId()));
         pmDemandReqVo.setUserId(getUserId());
         IPage<PmDemandResVo> page = pmDemandService.selectPmDemandList(pmDemandReqVo, 0);
         return success(page);

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

@@ -599,18 +599,17 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
                 lw.eq(PmAuditDeptRef::getRefId, o.getPlanPracticalId());
                 lw.eq(PmAuditDeptRef::getRefType, "1");
                 List<PmAuditDeptRef> list = pmAuditDeptRefService.list(lw);
-
-                if (!ObjectUtils.isEmpty(list)) {
+                boolean fl = true;
+                if (!ObjectUtils.isEmpty(list) && list.size() > 0) {
                     List<PmAuditDeptRef> collect = list.stream()
                             .filter(f -> f.getDeptId().equals(Long.valueOf(vo.getPurchaseDeptId())))
                             .collect(Collectors.toList());
                     String deptLevel = collect.get(0).getDeptLevel();
-                    boolean f = true;
-                    f = 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"))) {
-                            f = false;
+                            fl = false;
                         }
                     }
                     /*
@@ -619,7 +618,7 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
                 System.out.println(s1.compareTo(s2));
                 *   over: -1
                 * */
-                    o.setFlag(f);
+                    o.setFlag(fl);
                 }
                 return o;
             }).collect(Collectors.toList());

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

@@ -1238,21 +1238,20 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                 lw.eq(PmAuditDeptRef::getRefType, "0");
                 List<PmAuditDeptRef> list = pmAuditDeptRefService.list(lw);
 
-
-                if (!ObjectUtils.isEmpty(list)) {
+                boolean fl = true;
+                if (!ObjectUtils.isEmpty(list) && list.size() > 0) {
                     // 当地 年度计划 当前部门 的 审核数据
                     List<PmAuditDeptRef> collect = list.stream()
                             .filter(f -> f.getDeptId().equals(Long.valueOf(vo.getPurchaseDeptId())))
                             .collect(Collectors.toList());
                     String deptLevel = collect.get(0).getDeptLevel();
 
-                    boolean f = true;
-                    f = 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"))) {
-                            f = false;
+                            fl = false;
                         }
                     }
                     /*
@@ -1261,7 +1260,7 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                 System.out.println(s1.compareTo(s2));
                 *    -1
                 * */
-                    o.setFlag(f);
+                    o.setFlag(fl);
                 }
                 return o;
             }).collect(Collectors.toList());

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

@@ -514,17 +514,18 @@ public class ProvisionalPlanServiceImpl extends ServiceImpl<ProvisionalPlanMappe
                 lw.eq(PmAuditDeptRef::getRefId, o.getPlanPracticalId());
                 lw.eq(PmAuditDeptRef::getRefType, "1");
                 List<PmAuditDeptRef> list = pmAuditDeptRefService.list(lw);
-                if (!ObjectUtils.isEmpty(list)) {
+                boolean fl = true;
+                if (!ObjectUtils.isEmpty(list) && list.size() > 0) {
                     List<PmAuditDeptRef> collect = list.stream()
                             .filter(f -> f.getDeptId().equals(Long.valueOf(vo.getPurchaseDeptId())))
                             .collect(Collectors.toList());
                     String deptLevel = collect.get(0).getDeptLevel();
-                    boolean f = true;
-                    f = 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"))) {
-                            f = false;
+                            fl = false;
                         }
                     }
                     /*
@@ -533,7 +534,7 @@ public class ProvisionalPlanServiceImpl extends ServiceImpl<ProvisionalPlanMappe
                 System.out.println(s1.compareTo(s2));
                 *   over: -1
                 * */
-                    o.setFlag(f);
+                    o.setFlag(fl);
                 }
                 return o;
             }).collect(Collectors.toList());

purchase-system/src/main/java/com/ozs/pm/doman/vo/requestVo/PmDemandReqVo.java

@@ -125,4 +125,5 @@ public class PmDemandReqVo extends PageVo {
     private Long deptId;
 
     private Long userId;
+    private Boolean isAdmin;
 }

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

@@ -398,15 +398,16 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
         l.eq(PmAuditDeptRef::getDeptId, SecurityUtils.getDeptId());
         l.eq(PmAuditDeptRef::getRefType, "2");
         list = pmAuditDeptRefService.list(l);
-        if (Arrays.asList(1, 2, 3).contains(reqType)) {
-            if (!ObjectUtils.isEmpty(list) && !SecurityUtils.getUserId().equals(Integer.parseInt("1"))) {
-                lw.in(PmDemand::getDemandId, list.stream().map(PmAuditDeptRef::getRefId).collect(Collectors.toList()));
+        if (!pmDemandReqVo.getIsAdmin()) {
+            if (Arrays.asList(1, 2, 3).contains(reqType)) {
+                if (!ObjectUtils.isEmpty(list) && !SecurityUtils.getUserId().equals(Integer.parseInt("1"))) {
+                    lw.in(PmDemand::getDemandId, list.stream().map(PmAuditDeptRef::getRefId).collect(Collectors.toList()));
+                }
+            } else {
+                lw.eq(PmDemand::getPurchaseDeptId, SecurityUtils.getDeptId());
             }
-        } else {
-            lw.eq(PmDemand::getPurchaseDeptId, SecurityUtils.getDeptId());
         }
 
-
         if (!StringUtils.isBlank(pmDemandReqVo.getProjectName())) {
             lw.like(PmDemand::getProjectName, "%" + pmDemandReqVo.getProjectName() + "%");
         }