From faab3a5c5d0e1cfc418f8733d0c17235e7b44c5c Mon Sep 17 00:00:00 2001
From: dearLin <1261008090@qq.com>
Date: Thu, 26 Mar 2026 11:24:17 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E5=AE=8C=E5=96=84=E5=8D=95?=
 =?UTF-8?q?=E4=BD=8D=E8=BD=A6=E8=BE=86=E7=9A=84=E5=8F=91=E8=B5=B7=E4=BA=BA?=
 =?UTF-8?q?=E4=B8=8E=E5=8F=91=E8=B5=B7=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../zcloud/primeport/command/query/PersonApplyQueryExe.java  | 2 +-
 .../zcloud/primeport/command/query/VehicleAuditQueryExe.java | 3 +--
 .../java/com/zcloud/primeport/domain/enums/MenuEnum.java     | 4 +++-
 .../repository/impl/VehicleApplyRepositoryImpl.java          | 5 +++--
 .../src/main/resources/mapper/VehicleApplyDO.xml             | 1 +
 .../src/main/resources/mapper/VehicleAuditDO.xml             | 4 +++-
 6 files changed, 12 insertions(+), 7 deletions(-)

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 88aa352..cc2da6b 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
@@ -71,7 +71,7 @@ public class PersonApplyQueryExe {
         if (!examCenterCOS.isEmpty()) {
             examCenterCOS.forEach(item -> {
                 item.setCurrentUserCanAudit(2);
-                if (item.getAuditUserId().equals(userId)) {
+                if (userId.equals(item.getAuditUserId())) {
                     item.setCurrentUserCanAudit(1);
                 }
             });
diff --git a/web-app/src/main/java/com/zcloud/primeport/command/query/VehicleAuditQueryExe.java b/web-app/src/main/java/com/zcloud/primeport/command/query/VehicleAuditQueryExe.java
index 984085c..f114f4a 100644
--- a/web-app/src/main/java/com/zcloud/primeport/command/query/VehicleAuditQueryExe.java
+++ b/web-app/src/main/java/com/zcloud/primeport/command/query/VehicleAuditQueryExe.java
@@ -57,8 +57,7 @@ public class VehicleAuditQueryExe {
         Map<String, Object> parmas = PageQueryHelper.toHashMap(qry);
         PageResponse<VehicleAuditDO> vehicleAuditDOPageResponse = vehicleAuditRepository.carApprovalLogByvehicleApplyIdList(parmas);
         List<VehicleAuditCO> vehicleAuditCOS = vehicleAuditCoConvertor.converDOsToCOs(vehicleAuditDOPageResponse.getData());
-        return PageResponse.of(vehicleAuditCOS, vehicleAuditDOPageResponse.getTotalCount(),
-                vehicleAuditDOPageResponse.getPageSize(), vehicleAuditDOPageResponse.getPageIndex());
+        return PageResponse.of(vehicleAuditCOS, vehicleAuditDOPageResponse.getTotalCount(), vehicleAuditDOPageResponse.getPageSize(), vehicleAuditDOPageResponse.getPageIndex());
     }
 
     public VehicleAuditCO getInfoById(Long id) {
diff --git a/web-domain/src/main/java/com/zcloud/primeport/domain/enums/MenuEnum.java b/web-domain/src/main/java/com/zcloud/primeport/domain/enums/MenuEnum.java
index 6dac373..09edb2e 100644
--- a/web-domain/src/main/java/com/zcloud/primeport/domain/enums/MenuEnum.java
+++ b/web-domain/src/main/java/com/zcloud/primeport/domain/enums/MenuEnum.java
@@ -292,7 +292,9 @@ public enum MenuEnum {
     /**
      * 车辆封闭区域申请记录
      */
-    XGS_CHE_LIANG_FENG_BI_QU_YU_SHEN_QING_JI_LU("/primeport/container/stakeholder/enclosedArea/apply/vehicleRecords/list", "xgs-che-liang-feng-bi-qu-yu-shen-qing-ji-lu");
+    XGS_CHE_LIANG_FENG_BI_QU_YU_SHEN_QING_JI_LU("/primeport/container/stakeholder/enclosedArea/apply/vehicleRecords/list", "xgs-che-liang-feng-bi-qu-yu-shen-qing-ji-lu"),
+    ZGDW_LSRYGL_RECORD("/primeport/container/stakeholder/firstLevelDoor/portEntryApproval/temporaryVisitor/temporaryPersonnelRecords/list", "zgdw-lsrygljl"),
+    ZGDW_LSCLGL_RECORD("/primeport/container/stakeholder/firstLevelDoor/portEntryApproval/temporaryVisitor/temporaryVehicleRecords/list", "zgdw-lsclgljl");
 
     private final String path;
     private final String menuKey;
diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/VehicleApplyRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/VehicleApplyRepositoryImpl.java
index bd35c38..d84269d 100644
--- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/VehicleApplyRepositoryImpl.java
+++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/VehicleApplyRepositoryImpl.java
@@ -63,9 +63,10 @@ public class VehicleApplyRepositoryImpl extends BaseRepositoryImpl<VehicleApplyM
         queryWrapper.eq("vehicle_belong_type", params.get("vehicleBelongType"));
         queryWrapper.eq("audit_flag", AuditEnum.APPROVED.getCode());
         queryWrapper.eq("mkmj_permission", 1);
-        queryWrapper.like(Tools.notEmpty(params.get("licenceNo").toString()),"licence_no", params.get("licenceNo"));
+        queryWrapper.like(!Tools.isEmpty(params.get("licenceNo")),"licence_no", params.get("licenceNo"));
         String vehicleBelongType = params.get("vehicleBelongType").toString();
-        if (VehicleBelongTypeEnum.JGD_PRI_VEHICLES.getCode().equals(vehicleBelongType) ||VehicleBelongTypeEnum.FGS_PRI_VEHICLES.getCode().equals(vehicleBelongType)) {
+        if (VehicleBelongTypeEnum.JGD_PRI_VEHICLES.getCode().equals(vehicleBelongType)
+                ||VehicleBelongTypeEnum.FGS_PRI_VEHICLES.getCode().equals(vehicleBelongType)) {
             // 分公司、股份个人车，查询当前登录用户车辆
             queryWrapper.eq("employee_vehicle_user_id", AuthContext.getUserId());
         }
diff --git a/web-infrastructure/src/main/resources/mapper/VehicleApplyDO.xml b/web-infrastructure/src/main/resources/mapper/VehicleApplyDO.xml
index 4ec7138..2b4071f 100644
--- a/web-infrastructure/src/main/resources/mapper/VehicleApplyDO.xml
+++ b/web-infrastructure/src/main/resources/mapper/VehicleApplyDO.xml
@@ -75,6 +75,7 @@
         <if test="params.employeeVehicleUserId != null">
             AND f.employee_vehicle_user_id = #{params.employeeVehicleUserId}
         </if>
+        order by f.id desc
     </select>
     <select id="fgsCount" resultType="com.zcloud.primeport.persistence.dataobject.FgsVehicleCountDto">
         SELECT
diff --git a/web-infrastructure/src/main/resources/mapper/VehicleAuditDO.xml b/web-infrastructure/src/main/resources/mapper/VehicleAuditDO.xml
index 8affcf1..16bda0b 100644
--- a/web-infrastructure/src/main/resources/mapper/VehicleAuditDO.xml
+++ b/web-infrastructure/src/main/resources/mapper/VehicleAuditDO.xml
@@ -130,7 +130,9 @@
             vap.vehicle_department_id,
             vap.vehicle_department_name,
             vap.employee_vehicle_user_id,
-            vap.employee_vehicle_user_name
+            vap.employee_vehicle_user_name,
+            vap.create_name apply_user_name,
+            vap.create_time apply_time
         FROM
             vehicle_audit AS va
                 LEFT JOIN vehicle_apply vap on va.vehicle_apply_id = vap.id