Skip to content

fix(ci): guard exception resolve lookup #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
1634594707 merged 1 commit into from
Jun 8, 2026
Merged

fix(ci): guard exception resolve lookup #5

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion back/fsd-admin-api/src/main/java/com/fsd/admin/controller/AdminDispatchController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,10 +390,13 @@ public ApiResponse<Void> resolveException(@PathVariable Long exceptionId,
HttpServletRequest httpRequest) {
AdminAuthSupport.requireAuth(httpRequest);
DispatchExceptionRecordEntity exception = dispatchExceptionService.getException(exceptionId);
if ("RESOLVED".equals(exception.getExceptionStatus())) {
if (exception != null && "RESOLVED".equals(exception.getExceptionStatus())) {
throw new BusinessException("DISPATCH_EXCEPTION_ALREADY_RESOLVED", "Dispatch exception already resolved");
}
if ("REASSIGN".equals(request.getAction())) {
if (exception == null) {
throw new BusinessException("DISPATCH_EXCEPTION_NOT_FOUND", "Dispatch exception not found");
}
if (request.getVehicleId() == null) {
throw new BusinessException("DISPATCH_EXCEPTION_VEHICLE_REQUIRED", "Reassign action requires vehicleId");
}
Expand Down
Loading