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 list= vehicleService.getList1(vehiclePagination); //处理id字段转名称,若无需转或者为空可删除 for(VehicleEntity entity:list){ -// entity.setVehiclephotos(generaterSwapUtil.getFileNameInJson(entity.getVehiclephotos())); + entity.setVehiclephotos(generaterSwapUtil.getFileNameInJson(entity.getVehiclephotos())); } List 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} AND a.ticketno like concat('%',#{vehiclePagination.ticketno},'%') 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) => {