|
|
|
@ -227,7 +227,7 @@ public class VehicleServiceImpl extends ServiceImpl<VehicleMapper, VehicleEntity
|
|
|
|
|
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
|
|
|
|
|
if(isPc && pcPermission){
|
|
|
|
|
if (!userProvider.get().getIsAdministrator()){
|
|
|
|
|
Object vehicleObj=authorizeService.getCondition(new AuthorizeConditionModel(vehicleQueryWrapper,vehiclePagination.getMenuId(),"jg_vehicle"));
|
|
|
|
|
Object vehicleObj=authorizeService.getCondition2(new AuthorizeConditionModel(vehicleQueryWrapper,vehiclePagination.getMenuId(),"jg_vehicle"));
|
|
|
|
|
if (ObjectUtil.isEmpty(vehicleObj)){
|
|
|
|
|
return new ArrayList<>();
|
|
|
|
|
} else {
|
|
|
|
@ -238,7 +238,7 @@ public class VehicleServiceImpl extends ServiceImpl<VehicleMapper, VehicleEntity
|
|
|
|
|
}
|
|
|
|
|
if(!isPc && appPermission){
|
|
|
|
|
if (!userProvider.get().getIsAdministrator()){
|
|
|
|
|
Object vehicleObj=authorizeService.getCondition(new AuthorizeConditionModel(vehicleQueryWrapper,vehiclePagination.getMenuId(),"jg_vehicle"));
|
|
|
|
|
Object vehicleObj=authorizeService.getCondition2(new AuthorizeConditionModel(vehicleQueryWrapper,vehiclePagination.getMenuId(),"jg_vehicle"));
|
|
|
|
|
if (ObjectUtil.isEmpty(vehicleObj)){
|
|
|
|
|
return new ArrayList<>();
|
|
|
|
|
} else {
|
|
|
|
|