|
@ -510,9 +510,9 @@ public class IcNatServiceImpl extends BaseServiceImpl<IcNatDao, IcNatEntity> imp |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
// 检测地点和手机号先不提示,说需要提示再提示。需要考虑两个都不为空&&不相等 || 两个中一个为空一个不为空
|
|
|
// 检测地点和手机号先不提示,说需要提示再提示。需要考虑两个都不为空&&不相等 || 两个中一个为空一个不为空
|
|
|
if ((natAddress == null && resiNat.getNatAddress() != null) |
|
|
if ((StringUtils.isBlank(natAddress) && StringUtils.isNotBlank(resiNat.getNatAddress())) |
|
|
|| (natAddress != null && resiNat.getNatAddress() == null) |
|
|
|| (StringUtils.isNotBlank(natAddress) && StringUtils.isBlank(resiNat.getNatAddress())) |
|
|
|| (natAddress != null && resiNat.getNatAddress() != null && !natAddress.equals(resiNat.getNatAddress()))) { |
|
|
|| (StringUtils.isNotBlank(natAddress) && StringUtils.isNotBlank(resiNat.getNatAddress()) && !natAddress.equals(resiNat.getNatAddress()))) { |
|
|
resiNat.setNatAddress(natAddress); |
|
|
resiNat.setNatAddress(natAddress); |
|
|
needUpdate = true; |
|
|
needUpdate = true; |
|
|
} |
|
|
} |
|
|