调整Address新增、修改时校验逻辑

src/main/java/com/sqx/modules/address/controller/app/InsideAddressController.java

@@ -3,7 +3,6 @@ package com.sqx.modules.address.controller.app;
 import com.sqx.common.utils.Result;
 import com.sqx.modules.address.entity.InsideAddress;
 import com.sqx.modules.address.service.InsideAddressService;
-import com.sqx.modules.address.vo.InsideAddressShortVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;

src/main/java/com/sqx/modules/address/service/impl/AddressServiceImpl.java

@@ -38,7 +38,7 @@ public class AddressServiceImpl extends ServiceImpl<AddressDao, Address> impleme
         CommonInfo insideAddressSetting = commonInfoService.findOne(442);
 
         boolean insideAddressFlag = false;
-        if (ObjectUtil.isNull(insideAddressSetting) && StrUtil.equals(insideAddressSetting.getValue(), Constant.YES)) {
+        if (ObjectUtil.isNotNull(insideAddressSetting) && StrUtil.equals(insideAddressSetting.getValue(), Constant.YES)) {
             insideAddressFlag = true;
         }
 
@@ -141,9 +141,9 @@ public class AddressServiceImpl extends ServiceImpl<AddressDao, Address> impleme
      * @param address 地址参数
      */
     private void validateAddress(Address address) {
-        if (ObjectUtil.isNull(address.getInsideAddressId())) {
+        CommonInfo insideAddressSetting = commonInfoService.findOne(442);
+        if (ObjectUtil.isNotNull(insideAddressSetting) && StrUtil.equals(insideAddressSetting.getValue(), Constant.YES)) {
             ValidatorUtils.validateEntity(address, InsideAddressGroup.class);
-
             InsideAddress insideAddress = insideAddressService.getById(address.getInsideAddressId());
             if (ObjectUtil.isNull(insideAddress)) {
                 throw new SqxException("无效的内部地址id");