解决冲突

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/PersonBasicServiceImpl.java

@@ -140,7 +140,7 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa
             personBasic.setProjectOrgCode(companyModel.getOrgCode());
         }
 
-        if (!personUser.getNativePlace().isEmpty()) {
+        if (personUser.getNativePlace()!=null) {
             personBasic.setNativePlace(JSON.toJSONString(personUser.getNativePlace()));
         }
         personAccount.setPuserId(agencyUserModel.getUserId());