修改bug

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/entity/SysRegion.java

 package com.xxfc.platform.vehicle.entity;
 
+import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Tolerate;
 
 @Data
+@Builder(toBuilder = true)
 public class SysRegion {
 
+    @Tolerate
+    public SysRegion() {
+    }
+
     private Long id;
 
     /**

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.xxfc.platform.vehicle.mapper.VehicleMapper">
 
     <resultMap id="searchUsableMap" type="com.xxfc.platform.vehicle.vo.UsableVehicleVO">
-        <collection column="company_id" property="company_id" ofType="com.xxfc.platform.vehicle" select="getAttribute" >
+<!--        <collection column="company_id" property="company_id" ofType="com.xxfc.platform.vehicle" select="getAttribute" >-->
     </resultMap>
     
     <update id="updateStatusById" parameterType="java.util.Map">

xx-vehicle/xx-vehicle-server/src/test/java/com/xxfc/vehicle/RegionTest.java

@@ -38,7 +38,13 @@ public class RegionTest {
                 for(SysRegion sysRegion : sysRegions) {
                     if(PinyinHelper.getShortPinyin(sysRegion.getName()).substring(0,1).equals(String.valueOf((char)(96+i)))){
                             //(sysRegion.getName()))
-                        str += "{\"id\":"+sysRegion.getId()+", \"name\":\""+sysRegion.getName()+"\"},\n";
+                        String name = sysRegion.getName();
+                        if("直辖县级".equals(name)) {
+                            //获得父级
+                            SysRegion sysRegionP = sysRegionBiz.selectOne(SysRegion.builder().parentId(sysRegion.getId()).build());
+                            name = sysRegionP.getName();
+                        }
+                        str += "{\"id\":"+sysRegion.getId()+", \"name\":\""+name+"\"},\n";
                         flag = true;
                     }
                 }