From 897c0e43cf3e71f54b2005a06229f2168bfa5620 Mon Sep 17 00:00:00 2001 From: tianxinlei Date: Wed, 8 Jul 2026 16:43:55 +0800 Subject: [PATCH] =?UTF-8?q?0708=20-=20bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/zcloud/primeport/command/VehicleApplyAddExe.java | 4 ++++ .../command/query/ClosedAreaPersonApplyQueryExe.java | 3 +++ .../zcloud/primeport/command/query/PersonApplyQueryExe.java | 3 +++ .../java/com/zcloud/primeport/dto/VehicleApplyAddCmd.java | 4 ++-- 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/web-app/src/main/java/com/zcloud/primeport/command/VehicleApplyAddExe.java b/web-app/src/main/java/com/zcloud/primeport/command/VehicleApplyAddExe.java index 00498c8..1c164fb 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/VehicleApplyAddExe.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/VehicleApplyAddExe.java @@ -72,6 +72,10 @@ public class VehicleApplyAddExe { SSOUser user = AuthContext.getCurrentUser(); examTypeE.setVehicleCorpId(user.getTenantId()); examTypeE.setVehicleCorpName(user.getTenantName()); + examTypeE.setVehicleDepartmentId(user.getOrgId()); + examTypeE.setVehicleDepartmentName(user.getOrgName()); + examTypeE.setEmployeeVehicleUserId(user.getUserId()); + examTypeE.setEmployeeVehicleUserName(user.getName()); } // 临时 if (cmd.getVehicleBelongType().equals(VehicleBelongTypeEnum.TEMP_VEHICLES.getCode())){ diff --git a/web-app/src/main/java/com/zcloud/primeport/command/query/ClosedAreaPersonApplyQueryExe.java b/web-app/src/main/java/com/zcloud/primeport/command/query/ClosedAreaPersonApplyQueryExe.java index e1d3b58..4258727 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/query/ClosedAreaPersonApplyQueryExe.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/query/ClosedAreaPersonApplyQueryExe.java @@ -86,6 +86,9 @@ public class ClosedAreaPersonApplyQueryExe { } else { co.setCurrentUserCanAudit(2); } + if (co.getApplyUserName() == null) { + co.setApplyUserName(co.getApplyPersonUserName()); + } } return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); diff --git a/web-app/src/main/java/com/zcloud/primeport/command/query/PersonApplyQueryExe.java b/web-app/src/main/java/com/zcloud/primeport/command/query/PersonApplyQueryExe.java index 037eb09..a500a91 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/query/PersonApplyQueryExe.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/query/PersonApplyQueryExe.java @@ -60,6 +60,9 @@ public class PersonApplyQueryExe { item.setCurrentUserCanAudit(1); } } + if (item.getApplyUserName() == null) { + item.setApplyUserName(item.getEmployeePersonUserName()); + } }); } return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleApplyAddCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleApplyAddCmd.java index 6ae9d0f..142b04a 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleApplyAddCmd.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleApplyAddCmd.java @@ -96,10 +96,10 @@ public class VehicleApplyAddCmd extends Command { //车辆所属部门名称 private String vehicleDepartmentName; @ApiModelProperty(value = "车辆所属人id", name = "employeeVehicleUserId") - //车辆所属部门id + //车辆所属人员id private Long employeeVehicleUserId; @ApiModelProperty(value = "车辆所属人名称", name = "employeeVehicleUserName") - //车辆所属部门名称 + //车辆所属人员名称 private String employeeVehicleUserName; // 审批 @ApiModelProperty(value = "审核企业", name = "auditCorpId")