diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaManagePermissionService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaManagePermissionService.java index 1a1a5ab1e..a3894da52 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaManagePermissionService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaManagePermissionService.java @@ -58,4 +58,7 @@ public interface IOtaManagePermissionService extends IService queryList(); + + + List queryByUserId(String userId); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java index d868e9bd1..aba432656 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java @@ -207,9 +207,7 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(OtaManagePermission::getUserId, currentUser.getId()); - List managePermissionList = otaManagePermissionService.list(wrapper); + List managePermissionList = otaManagePermissionService.queryByUserId(currentUser.getId()); if (!managePermissionList.isEmpty()) { List applyIdList = managePermissionList.stream().map(OtaManagePermission::getApplyId).distinct().collect(Collectors.toList()); List collect = otaManageApplyEOList.stream().filter(e -> applyIdList.contains(e.getPlannedBpLaunchBatch())).collect(Collectors.toList()); @@ -297,6 +295,9 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl getAllCarPage(OtaManageApplyEO otaManageApplyEO) { + if(!hasPermission(otaManageApplyEO.getPlannedBpLaunchBatch())){ + return new ArrayList<>(); + } List otaManageApplyEOList = this.getBaseMapper().getOtaList(otaManageApplyEO); //studio数据权限 if (isOtaManager()) { @@ -674,6 +675,21 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl managePermissionList = otaManagePermissionService.queryByUserId(currentUser.getId()); + if (!managePermissionList.isEmpty()) { + List applyIdList = managePermissionList.stream().map(OtaManagePermission::getApplyId).distinct().collect(Collectors.toList()); + if(applyIdList.contains(plannedBpLaunchBatch)){ + return true; + } + } + return false; + } + /** * 分车型列表-分页列表查询 * @@ -682,6 +698,9 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl getOtaCarPage(OtaManageApplyEO otaManageApplyEO, String cut) { + if(!hasPermission(otaManageApplyEO.getPlannedBpLaunchBatch())){ + return new ArrayList<>(); + } List otaManageApplyEOList = this.getBaseMapper().getOtaCarPage(otaManageApplyEO); List list = new ArrayList<>(); Map omaMap = new HashMap<>(); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManagePermissionServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManagePermissionServiceImpl.java index 2dbe16f5d..6cc76109f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManagePermissionServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManagePermissionServiceImpl.java @@ -1,5 +1,6 @@ package com.jero.modules.ota.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.jero.modules.ota.entity.OtaManagePermission; import com.jero.modules.ota.mapper.OtaManagePermissionMapper; import com.jero.modules.ota.service.IOtaManagePermissionService; @@ -86,4 +87,11 @@ public class OtaManagePermissionServiceImpl extends ServiceImpl queryList() { return list(); } + + @Override + public List queryByUserId(String userId) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(OtaManagePermission::getUserId, userId); + return this.list(wrapper); + } }