diff --git a/src/main/java/com/gxwebsoft/law/controller/LawOrgController.java b/src/main/java/com/gxwebsoft/law/controller/LawOrgController.java index 4115e9a..a6ff687 100644 --- a/src/main/java/com/gxwebsoft/law/controller/LawOrgController.java +++ b/src/main/java/com/gxwebsoft/law/controller/LawOrgController.java @@ -92,17 +92,17 @@ public class LawOrgController extends BaseController { if (province != null) { lawOrg.setProvinceId(province.getId()); } - } - if (lawOrg.getCity() != null) { - Area city = areaService.getCityByName(lawOrg.getCity()); - if (city != null) { - lawOrg.setCityId(city.getId()); - } - } - if (lawOrg.getRegion() != null) { - Area region = areaService.getRegionByName(lawOrg.getRegion()); - if (region != null) { - lawOrg.setAreaId(region.getId()); + if (lawOrg.getCity() != null) { + Area city = areaService.getCityByName(lawOrg.getCity()); + if (city != null) { + lawOrg.setCityId(city.getId()); + } + if (lawOrg.getRegion() != null) { + Area region = areaService.getRegionByName(lawOrg.getRegion()); + if (region != null) { + lawOrg.setAreaId(region.getId()); + } + } } } if (lawOrgService.updateById(lawOrg)) { diff --git a/src/main/java/com/gxwebsoft/law/entity/LawNotaryConfig.java b/src/main/java/com/gxwebsoft/law/entity/LawNotaryConfig.java index 9731b16..260c8d1 100644 --- a/src/main/java/com/gxwebsoft/law/entity/LawNotaryConfig.java +++ b/src/main/java/com/gxwebsoft/law/entity/LawNotaryConfig.java @@ -29,6 +29,8 @@ public class LawNotaryConfig implements Serializable { private String title; + private String type; + @ApiModelProperty(value = "配置") private String configList;