diff --git a/src/main/java/com/zcloud/controller/operatingvehicles/OperatingVehiclesController.java b/src/main/java/com/zcloud/controller/operatingvehicles/OperatingVehiclesController.java index 8157205..45aacfa 100644 --- a/src/main/java/com/zcloud/controller/operatingvehicles/OperatingVehiclesController.java +++ b/src/main/java/com/zcloud/controller/operatingvehicles/OperatingVehiclesController.java @@ -217,7 +217,6 @@ public class OperatingVehiclesController extends BaseController { pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID page.setPd(pd); List varList = operatingVehiclesService.list(page); //列出Question列表 - map.put("varList", varList); map.put("page", page); map.put("result", errInfo); diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityAccidentInvestigationMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityAccidentInvestigationMapper.xml index 7cf0b63..93ee696 100644 --- a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityAccidentInvestigationMapper.xml +++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityAccidentInvestigationMapper.xml @@ -361,10 +361,12 @@ diff --git a/src/main/resources/mybatis/datasource/freighttrailer/FreightTrailerMapper.xml b/src/main/resources/mybatis/datasource/freighttrailer/FreightTrailerMapper.xml index fa63cca..be26cf2 100644 --- a/src/main/resources/mybatis/datasource/freighttrailer/FreightTrailerMapper.xml +++ b/src/main/resources/mybatis/datasource/freighttrailer/FreightTrailerMapper.xml @@ -216,10 +216,12 @@ f.CREATORNAME, f.CREATTIME, f.ISDELETE, - b.COMPANY_AREA + b.COMPANY_AREA, + dep.NAME AS DEPARTMENTNAME from f inner join bus_corp_info b on f.CORPINFO_ID = b.CORPINFO_ID + LEFT JOIN oa_department dep ON dep.DEPARTMENT_ID = f.BELONGING_DEPT where f.FREIGHTTRAILER_ID = #{FREIGHTTRAILER_ID} AND diff --git a/src/main/resources/mybatis/datasource/operatingvehicles/OperatingVehiclesMapper.xml b/src/main/resources/mybatis/datasource/operatingvehicles/OperatingVehiclesMapper.xml index d4d607b..31639e8 100644 --- a/src/main/resources/mybatis/datasource/operatingvehicles/OperatingVehiclesMapper.xml +++ b/src/main/resources/mybatis/datasource/operatingvehicles/OperatingVehiclesMapper.xml @@ -298,9 +298,11 @@ select - + , + dep.NAME AS DEPARTMENTNAME from f + inner join oa_department dep on dep.DEPARTMENT_ID = f.BELONGING_DEPARTMENT where f.ISDELETE = '0' and f.CORPINFO_ID = #{pd.CORPINFO_ID} and f.PLATE_NUMBER LIKE CONCAT(CONCAT('%', #{pd.PLATE_NUMBER}),'%')