screen-manage 完成sysarea模块查询 拦截器逻辑代码完成 修改organization和accountBug

kaiyu

2021-04-07 4d5eff3b824dac8e50400b2ec1114cba4ed6a87c

 screen-manage/src/main/java/com/moral/api/pojo/form/organization/OrganizationInsertForm.java

@@ -20,7 +20,7 @@
 * @Version TODO
 **/
@Data
public class OrganizationInsertForm implements Serializable {
public class OrganizationInsertForm {

    private Integer parentId;

@@ -28,15 +28,19 @@

    private Integer provinceCode;

    private String provinceName;

    private Integer cityCode;

    private String cityName;

    private Integer areaCode;

    private Long townCode;
    private String areaName;

    private Long villageCode;
    private Integer locationLevelCode;

    private String locationLevel;
    private String locationLevelName;

    private String address;

@@ -52,9 +56,9 @@
        if (
                ObjectUtils.isEmpty(name) ||
                        ObjectUtils.isEmpty(provinceCode) ||
                        ObjectUtils.isEmpty(cityCode) ||
                        ObjectUtils.isEmpty(areaCode) ||
                        ObjectUtils.isEmpty(locationLevel) ||
                        ObjectUtils.isEmpty(provinceName) ||
                        ObjectUtils.isEmpty(locationLevelCode) ||
                        ObjectUtils.isEmpty(locationLevelName)||
                        ObjectUtils.isEmpty(address) ||
                        ObjectUtils.isEmpty(expireTime)
                )
@@ -67,11 +71,13 @@
        organization.setParentId(parentId);
        organization.setName(name);
        organization.setProvinceCode(provinceCode);
        organization.setProvinceName(provinceName);
        organization.setCityCode(cityCode);
        organization.setCityName(cityName);
        organization.setAreaCode(areaCode);
        organization.setTownCode(townCode);
        organization.setVillageCode(villageCode);
        organization.setLocationLevel(locationLevel);
        organization.setAreaName(areaName);
        organization.setLocationLevelCode(locationLevelCode);
        organization.setLocationLevelName(locationLevelName);
        organization.setAddress(address);
        organization.setPhone(phone);
        organization.setEmail(email);