DeBugDeBugDeBug

purchase-admin/src/main/java/com/ozs/web/controller/home/HomeNoticeController.java

@@ -7,6 +7,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.utils.SecurityUtils;
 import com.ozs.common.utils.StringUtils;
@@ -82,7 +83,7 @@ public class HomeNoticeController extends BaseController {
         if (!StringUtils.isBlank(yearsStandardVo.getProjectName())) {
             lw.like(PlanYears::getProjectName, "%" + yearsStandardVo.getProjectName() + "%");
             lw.eq(PlanYears::getDelFlay, 0);
-            if (!SecurityUtils.getUserId().toString().equals("1")) {
+            if (!SysUser.isAdmin(SecurityUtils.getUserId())) {
                 lw.eq(PlanYears::getPurchaseDeptId, SecurityUtils.getDeptId());
             }
         }

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

@@ -648,7 +648,7 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
         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"))) {
+            if (!ObjectUtils.isEmpty(list) && !SysUser.isAdmin(SecurityUtils.getUserId())) {
                 lw.in(PmDemand::getDemandId, list.stream().map(PmAuditDeptRef::getRefId).collect(Collectors.toList()));
             }
             lw.eq(PmDemand::getPurchaseDeptId, SecurityUtils.getDeptId());

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