Merge remote-tracking branch 'origin/develop_tzs_main' into develop_tzs_main

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgChangeVehicleRegistrationUnitServiceImpl.java

@@ -908,7 +908,7 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
                 .map(String.class::cast)
                 .findFirst()
                 .orElse("");
-            if (!ValidationUtil.isEmpty(estateUnitName) && estateUnitName.contains("_")) {
+            if (!ValidationUtil.isEmpty(estateUnitName) && estateUnitName.contains("_") &&  estateUnitName.split("_").length >= 2) {
                 map.put("estateUnitCode", estateUnitName.split("_")[0]);
                 map.put("estateUnitName", estateUnitName.split("_")[1]);
             }