|
@@ -134,16 +134,16 @@ public class TestController {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- String villagerGroup = vaccineInfoOperation.getVillagerGroup();
|
|
|
- if (StringUtils.isNotBlank(villagerGroup)) {
|
|
|
- List<SysRegion> sysRegions = sysRegionMapper.selectSysRegionByName(villagerGroup);
|
|
|
+ String villager = vaccineInfoOperation.getVillage();
|
|
|
+ if (StringUtils.isNotBlank(villager)) {
|
|
|
+ List<SysRegion> sysRegions = sysRegionMapper.selectSysRegionByName(villager);
|
|
|
if (sysRegions.size() > 1) {
|
|
|
for (SysRegion sysRegion : sysRegions) {
|
|
|
if (sysRegion != null) {
|
|
|
Long villageTownsId = czrk.getVillageTownsId();
|
|
|
if (villageTownsId != null && villageTownsId.equals(sysRegion.getPid())) {
|
|
|
czrk.setVillageId(sysRegion.getAreaId());
|
|
|
- czrk.setVillageTowns(villagerGroup);
|
|
|
+ czrk.setVillage(villager);
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -151,7 +151,7 @@ public class TestController {
|
|
|
SysRegion sysRegion = sysRegions.get(0);
|
|
|
if (sysRegion != null) {
|
|
|
czrk.setVillageId(sysRegion.getAreaId());
|
|
|
- czrk.setVillageTowns(villagerGroup);
|
|
|
+ czrk.setVillage(villager);
|
|
|
}
|
|
|
}
|
|
|
}
|