diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/controller/TradeuploadController.java b/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/controller/TradeuploadController.java index 48cf2901..60510440 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/controller/TradeuploadController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/controller/TradeuploadController.java @@ -202,6 +202,12 @@ public class TradeuploadController { tradeuploadCrForm.setVehicleName(PlateNum); QueryWrapper vehicleQueryWrapper = new QueryWrapper<>(); vehicleQueryWrapper.lambda().eq(VehicleEntity::getTicketno, PlateNum); + String userId=userProvider.get().getUserId(); + String detpartment = null; + if (!userProvider.get().getIsAdministrator()) { + detpartment = userProvider.getDepartmentId(userId); + vehicleQueryWrapper.lambda().eq(VehicleEntity::getDepartmentId,detpartment); + } List vehicleEntityList = vehicleService.list(vehicleQueryWrapper); VehicleEntity vehicleEntity; if(vehicleEntityList != null && vehicleEntityList.size() > 0){ @@ -461,6 +467,15 @@ public class TradeuploadController { tradeuploadCrForm.setVehicleId(String.valueOf(map.get("PlateNum"))); QueryWrapper vehicleQueryWrapper = new QueryWrapper<>(); vehicleQueryWrapper.lambda().eq(VehicleEntity::getTicketno,map.get("PlateNum")); + + String userId=userProvider.get().getUserId(); + vehicleQueryWrapper.lambda().eq(VehicleEntity::getTicketno,map.get("PlateNum")); + String detpartment = null; + if (!userProvider.get().getIsAdministrator()) { + detpartment = userProvider.getDepartmentId(userId); + vehicleQueryWrapper.lambda().eq(VehicleEntity::getDepartmentId,detpartment); + } + VehicleEntity vehicleEntity = vehicleService.getOne(vehicleQueryWrapper); if (vehicleEntity != null){ tradeuploadCrForm.setVehiclePictures(vehicleEntity.getVehiclephotos());