diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLedgerServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLedgerServiceImpl.java index 0a7f97a..3808722 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLedgerServiceImpl.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLedgerServiceImpl.java @@ -11,7 +11,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njcn.common.pojo.enums.common.DataStateEnum; import com.njcn.csdevice.constant.DataParam; -import com.njcn.csdevice.controller.project.EngineeringController; import com.njcn.csdevice.enums.LineBaseEnum; import com.njcn.csdevice.mapper.*; import com.njcn.csdevice.pojo.dto.DevDetailDTO; @@ -210,7 +209,7 @@ public class CsLedgerServiceImpl extends ServiceImpl i List ledger; String role = RequestUtil.getUserRole(); List roles = JSONArray.parseArray(role, String.class); - if (roles.contains(AppRoleEnum.ROOT.getCode()) || roles.contains(AppRoleEnum.OPERATION_MANAGER.getCode())) { + if(roles.contains(AppRoleEnum.ROOT.getCode()) || roles.contains(AppRoleEnum.OPERATION_MANAGER.getCode()) || roles.contains(AppRoleEnum.REGULAR_USER.getCode())){ ledger = allList.stream() .filter(item -> Objects.equals(item.getLevel(), 2) && Objects.equals(item.getPid(), "0")) .collect(Collectors.toList()); @@ -414,7 +413,7 @@ public class CsLedgerServiceImpl extends ServiceImpl i List ledger; String role = RequestUtil.getUserRole(); List roles = JSONArray.parseArray(role, String.class); - if (roles.contains(AppRoleEnum.ROOT.getCode()) || roles.contains(AppRoleEnum.OPERATION_MANAGER.getCode())) { + if(roles.contains(AppRoleEnum.ROOT.getCode()) || roles.contains(AppRoleEnum.OPERATION_MANAGER.getCode()) || roles.contains(AppRoleEnum.REGULAR_USER.getCode())){ ledger = allList.stream() .filter(item -> Objects.equals(item.getLevel(), 2) && Objects.equals(item.getPid(), "0")) .collect(Collectors.toList()); diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/RoleEngineerDevServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/RoleEngineerDevServiceImpl.java index 528b0d0..3d20a85 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/RoleEngineerDevServiceImpl.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/RoleEngineerDevServiceImpl.java @@ -47,7 +47,7 @@ public class RoleEngineerDevServiceImpl implements RoleEngineerDevService { QueryWrapper csLedgerQueryWrapper = new QueryWrapper<>(); List collect = new ArrayList<>(); - if(Objects.equals(role,AppRoleEnum.APP_VIP_USER.getCode())){ + if(Objects.equals(role,AppRoleEnum.APP_VIP_USER.getCode()) || Objects.equals(role,AppRoleEnum.REGULAR_USER_8000.getCode())){ csDeviceUserPOQueryWrapper.clear(); csEngineeringUserPOQueryWrapper.clear(); csLedgerQueryWrapper.clear(); @@ -94,7 +94,7 @@ public class RoleEngineerDevServiceImpl implements RoleEngineerDevService { } // ||Objects.equals(role,"bxs_user") - else if(Objects.equals(role,AppRoleEnum.ROOT.getCode())||Objects.equals(role,AppRoleEnum.OPERATION_MANAGER.getCode())){ + else if(Objects.equals(role,AppRoleEnum.ROOT.getCode()) || Objects.equals(role,AppRoleEnum.OPERATION_MANAGER.getCode()) || Objects.equals(role,AppRoleEnum.REGULAR_USER.getCode()) ){ List csEngineeringPOS = csEngineeringMapper.selectList(null); collect =csEngineeringPOS.stream().filter(temp->Objects.equals(temp.getStatus(),"1")).map(CsEngineeringPO::getId).collect(Collectors.toList()); } @@ -116,7 +116,7 @@ public class RoleEngineerDevServiceImpl implements RoleEngineerDevService { List collect = new ArrayList<>(); if( - Objects.equals(role,AppRoleEnum.APP_VIP_USER.getCode())){ + Objects.equals(role,AppRoleEnum.APP_VIP_USER.getCode()) || Objects.equals(role,AppRoleEnum.REGULAR_USER_8000.getCode())){ csDeviceUserPOQueryWrapper.clear(); csDeviceUserPOQueryWrapper.eq("status","1").and(wq -> { wq.eq("primary_user_id", userIndex) @@ -198,7 +198,7 @@ public class RoleEngineerDevServiceImpl implements RoleEngineerDevService { } // ||Objects.equals(role,"bxs_user") - else if(Objects.equals(role,AppRoleEnum.ROOT.getCode())||Objects.equals(role,AppRoleEnum.OPERATION_MANAGER.getCode())){ + else if(Objects.equals(role,AppRoleEnum.ROOT.getCode())||Objects.equals(role,AppRoleEnum.OPERATION_MANAGER.getCode()) || Objects.equals(role,AppRoleEnum.REGULAR_USER.getCode())){ csLedgerQueryWrapper.clear(); csLedgerQueryWrapper.eq("level",2).eq("state",1); List csLedgers = csLedgerMapper.selectList(csLedgerQueryWrapper);