diff --git a/gather-app/src/main/java/com/ruoyi/business/controller/BusinessTripApprovalController.java b/gather-app/src/main/java/com/ruoyi/business/controller/BusinessTripApprovalController.java index 318df96..5e43ed6 100644 --- a/gather-app/src/main/java/com/ruoyi/business/controller/BusinessTripApprovalController.java +++ b/gather-app/src/main/java/com/ruoyi/business/controller/BusinessTripApprovalController.java @@ -534,12 +534,12 @@ public class BusinessTripApprovalController extends BaseController { if (businessTripApproval.getHasOffcialCar() == 1) { approvalProcess.setApprovalStatusH(100); userIds.add(2165L); + addLog(approvalProcess, userIds); } else { - approvalProcess.setApprovalStatusH(400); - userIds.add(1660L); - userIds.add(1661L); + approvalProcess.setApprovalStatusH(500); +// userIds.add(1660L); +// userIds.add(1661L); } - addLog(approvalProcess, userIds); } if (approvalStatus == 100) { if (dto.getDriverName() == null) { @@ -571,6 +571,15 @@ public class BusinessTripApprovalController extends BaseController { } if (approvalStatus == 400) { approvalProcess.setApprovalStatusH(500); + if (businessTripApproval.getHasOffcialCar() == 1) { + approvalProcess.setApprovalStatusH(450); + List userIds = new ArrayList<>(); + userIds.add(approvalProcess.getSubmitterId()); + addLog(approvalProcess, userIds); + } + } + if (approvalStatus == 450) { + approvalProcess.setApprovalStatusH(500); } one.setCheckState(dto.getState()); one.setCheckTime(System.currentTimeMillis() / 1000L);