渤海修改

src/main/java/com/ydtech/modules/admin/service/impl/SysQueryVehicleConfigServiceImpl.java

@@ -106,6 +106,9 @@ public class SysQueryVehicleConfigServiceImpl extends ServiceImpl<SysQueryVehicl
     @Override
     public SysQueryVehicleConfigDTO getByType(String type) {
         SysQueryVehicleConfigDTO sysQueryVehicleConfigDTO = baseMapper.getByType(type);
+        if(ObjectUtils.isEmpty(sysQueryVehicleConfigDTO)) {
+            return null;
+        }
         String substring = sysQueryVehicleConfigDTO.getCompanyId().substring(0, 4);
         if (InsuranceEnum.ZMBX.getCode().equals(substring)) {
             return null;

src/main/java/com/ydtech/modules/ins/model/ya/CarModelDTO.java

@@ -33,7 +33,7 @@ public class CarModelDTO {
     private String energyTypes; // 能源种类
     private String wholeWeight;//
     private String powerScale;//
-    private VehicleJingyou vehicleJingyo;
+//    private VehicleJingyou vehicleJingyo;
     private String vehicleSeatMax; // 最大座位数
     private String vehicleSeatMin; // 最小座位数
 

src/main/resources/mapper/modules/admin/SysUserMapper.xml

@@ -91,8 +91,8 @@
         (select approve_by from sys_user_track where user_id = su.id ORDER BY approve_time desc LIMIT 1) as approveBy,
         (select approve_time from sys_user_track where user_id = su.id ORDER BY approve_time desc LIMIT 1) as
         approveTime,
-        (select id from sys_dept where id = psd.id ) as levelFourDeptId,
-        (select name from sys_dept where id = psd.id) as levelFourDeptName
+        (select id from sys_dept where id = psd.parent_id ) as levelFourDeptId,
+        (select name from sys_dept where id = psd.parent_id) as levelFourDeptName
         from sys_user su
         left join sys_dept sd on su.dept_id=sd.id
         left join sys_dept psd on sd.parent_id=psd.id