zcloud_gbs
/
zcloud-gbs-primeport
16
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

0708 - bug修复

koumen
tianxinlei 2026-07-08 16:43:55 +08:00
parent d75f433fc2
commit 897c0e43cf
4 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
web-app/src/main/java/com/zcloud/primeport/command/VehicleApplyAddExe.java
View File

@ -72,6 +72,10 @@ public class VehicleApplyAddExe {
SSOUser user = AuthContext.getCurrentUser(); SSOUser user = AuthContext.getCurrentUser();
examTypeE.setVehicleCorpId(user.getTenantId()); examTypeE.setVehicleCorpId(user.getTenantId());
examTypeE.setVehicleCorpName(user.getTenantName()); 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())){ if (cmd.getVehicleBelongType().equals(VehicleBelongTypeEnum.TEMP_VEHICLES.getCode())){

3
web-app/src/main/java/com/zcloud/primeport/command/query/ClosedAreaPersonApplyQueryExe.java
View File

@ -86,6 +86,9 @@ public class ClosedAreaPersonApplyQueryExe {
} else { } else {
co.setCurrentUserCanAudit(2); co.setCurrentUserCanAudit(2);
} }
if (co.getApplyUserName() == null) {
co.setApplyUserName(co.getApplyPersonUserName());
}
} }
return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex());

3
web-app/src/main/java/com/zcloud/primeport/command/query/PersonApplyQueryExe.java
View File

@ -60,6 +60,9 @@ public class PersonApplyQueryExe {
item.setCurrentUserCanAudit(1); item.setCurrentUserCanAudit(1);
} }
} }
if (item.getApplyUserName() == null) {
item.setApplyUserName(item.getEmployeePersonUserName());
}
}); });
} }
return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex());

4
web-client/src/main/java/com/zcloud/primeport/dto/VehicleApplyAddCmd.java
View File

@ -96,10 +96,10 @@ public class VehicleApplyAddCmd extends Command {
//车辆所属部门名称 //车辆所属部门名称
private String vehicleDepartmentName; private String vehicleDepartmentName;
@ApiModelProperty(value = "车辆所属人id", name = "employeeVehicleUserId") @ApiModelProperty(value = "车辆所属人id", name = "employeeVehicleUserId")
//车辆所属部门id //车辆所属人员id
private Long employeeVehicleUserId; private Long employeeVehicleUserId;
@ApiModelProperty(value = "车辆所属人名称", name = "employeeVehicleUserName") @ApiModelProperty(value = "车辆所属人名称", name = "employeeVehicleUserName")
//车辆所属部门名称 //车辆所属人员名称
private String employeeVehicleUserName; private String employeeVehicleUserName;
// 审批 // 审批
@ApiModelProperty(value = "审核企业", name = "auditCorpId") @ApiModelProperty(value = "审核企业", name = "auditCorpId")