diff --git a/muyu-modules/muyu-system/src/test/java/com/forest/FoRestTest.java b/muyu-modules/muyu-system/src/test/java/com/forest/FoRestTest.java index 202b7c6..ba8bc08 100644 --- a/muyu-modules/muyu-system/src/test/java/com/forest/FoRestTest.java +++ b/muyu-modules/muyu-system/src/test/java/com/forest/FoRestTest.java @@ -36,27 +36,25 @@ public class FoRestTest { if (districtList.size() == 1 && "中华人民共和国".equals(districtList.get(0).getName())){ districtList = districtList.get(0).getDistricts(); } - List sysDistrictList = new ArrayList<>(); - conversion(sysDistrictList, districtList); - sysDistrictService.saveBatch(sysDistrictList); + conversion(0L, districtList); } - public void conversion(List sysDistrictList, List districtList){ + public void conversion(Long parentId, List districtList){ if (districtList == null || districtList.isEmpty()){ return; } for (District district : districtList) { - sysDistrictList.add( - SysDistrict.builder() - .level(district.getLevel()) - .code("[]".equals(district.getCode()) ? "-" : district.getCode()) - .name(district.getName()) - .center(district.getCenter()) - .areaCode(district.getAreaCode()) - .build() - ); - conversion(sysDistrictList, district.getDistricts()); + SysDistrict sysDistrict = SysDistrict.builder() + .parentId(parentId) + .level(district.getLevel()) + .code("[]".equals(district.getCode()) ? "-" : district.getCode()) + .name(district.getName()) + .center(district.getCenter()) + .areaCode(district.getAreaCode()) + .build(); + sysDistrictService.save(sysDistrict); + conversion(sysDistrict.getId(), district.getDistricts()); } }