diff --git a/src/main/java/com/xdap/self_development/service/impl/EngineParamDetailServiceImpl.java b/src/main/java/com/xdap/self_development/service/impl/EngineParamDetailServiceImpl.java index 9367342..64d0fb1 100644 --- a/src/main/java/com/xdap/self_development/service/impl/EngineParamDetailServiceImpl.java +++ b/src/main/java/com/xdap/self_development/service/impl/EngineParamDetailServiceImpl.java @@ -252,24 +252,33 @@ public class EngineParamDetailServiceImpl implements EngineParamDetailService { .eq("parameter_type", type) .doQuery(EngineParamDetailPojo.class)); } else { - List pojoList = sw.buildFromDatasource("xdap_app_223770822127386625") + detailPojos.addAll(sw.buildFromDatasource("xdap_app_223770822127386625") .eq("engine_model_id", engineModelID) .eq("version_status", code) .eq("subsystem_name", subsystem) .eq("parameter_type", type) - .doQuery(EngineParamDetailPojo.class); - //判断当前用户是否有参数权限 - List parameterIds = userPermissionGetter.getParamPermissions(); - for (String parameterId : parameterIds) { - List pojos = pojoList.stream().filter(x -> x.getParameterId().equals(parameterId)) - .collect(Collectors.toList()); - if (ObjectUtils.isNotEmpty(pojos)) { - detailPojos.addAll(pojos); - } - } + .doQuery(EngineParamDetailPojo.class)); +// 加权限先注释 List pojoList = sw.buildFromDatasource("xdap_app_223770822127386625") +// .eq("engine_model_id", engineModelID) +// .eq("version_status", code) +// .eq("subsystem_name", subsystem) +// .eq("parameter_type", type) +// .doQuery(EngineParamDetailPojo.class); +// //判断当前用户是否有参数权限 +// List parameterIds = userPermissionGetter.getParamPermissions(); +// for (String parameterId : parameterIds) { +// List pojos = pojoList.stream().filter(x -> x.getParameterId().equals(parameterId)) +// .collect(Collectors.toList()); +// if (ObjectUtils.isNotEmpty(pojos)) { +// detailPojos.addAll(pojos); +// } +// } } } + if (ObjectUtils.isEmpty(detailPojos)) { + throw new RuntimeException("没有可查看参数,可能是因为您没有权限"); + } if (ObjectUtils.isNotEmpty(engineParamDetailRequest.getMajorVersion()) && engineParamDetailRequest.getMajorVersion() != 0) { detailPojos = detailPojos.stream() .filter(x -> engineParamDetailRequest.getMajorVersion()