From fff733a7b0dd177e876449739011dd5ad91f17c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E4=B8=96=E5=BC=BA?= <vayne0702@163.com>
Date: Tue, 9 May 2023 13:05:42 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E7=AE=A1=E7=90=86=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jnpf/vehicle/controller/VehicleController.java    |  2 +-
 .../main/resources/mapper/vehicle/VehicleMapper.xml   | 11 +----------
 .../src/views/scm/basicInformation/vehicle/index.vue  |  2 +-
 3 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/vehicle/controller/VehicleController.java b/SC-boot/linkage-scm/src/main/java/jnpf/vehicle/controller/VehicleController.java
index f8cc6970..e2c27671 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/vehicle/controller/VehicleController.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/vehicle/controller/VehicleController.java
@@ -110,7 +110,7 @@ public class VehicleController {
         List<VehicleEntity> list= vehicleService.getList1(vehiclePagination);
         //处理id字段转名称，若无需转或者为空可删除
         for(VehicleEntity entity:list){
-//            entity.setVehiclephotos(generaterSwapUtil.getFileNameInJson(entity.getVehiclephotos()));
+            entity.setVehiclephotos(generaterSwapUtil.getFileNameInJson(entity.getVehiclephotos()));
         }
         List<VehicleListVO> listVO=JsonUtil.getJsonToList(list,VehicleListVO.class);
 //        for(VehicleListVO vehicleVO:listVO){
diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/vehicle/VehicleMapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/vehicle/VehicleMapper.xml
index 5c14391b..019c5401 100644
--- a/SC-boot/linkage-scm/src/main/resources/mapper/vehicle/VehicleMapper.xml
+++ b/SC-boot/linkage-scm/src/main/resources/mapper/vehicle/VehicleMapper.xml
@@ -66,17 +66,8 @@
         SELECT
         *
         FROM
-        (
-        SELECT
-        a.*
-        FROM
         jg_vehicle a
---         WHERE
---         ( a.delete_mark != 1 OR a.delete_mark IS NULL )
-
-        GROUP BY
-        a.id
-        ) a ${ew.customSqlSegment}
+        ${ew.customSqlSegment}
         <if test="vehiclePagination.ticketno != null and vehiclePagination.ticketno != ''">
             AND a.ticketno like concat('%',#{vehiclePagination.ticketno},'%')
         </if>
diff --git a/SC-web/src/views/scm/basicInformation/vehicle/index.vue b/SC-web/src/views/scm/basicInformation/vehicle/index.vue
index a72f0e4b..3b51152e 100644
--- a/SC-web/src/views/scm/basicInformation/vehicle/index.vue
+++ b/SC-web/src/views/scm/basicInformation/vehicle/index.vue
@@ -301,7 +301,7 @@ export default {
         menuId: this.menuId,
       };
       request({
-        url: `/api/example/Vehicle/getList`,
+        url: `/api/example/Vehicle/getList1`,
         method: "post",
         data: _query,
       }).then((res) => {