Merge branch 'develop_unit_register' of…

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/service/impl/RegUnitInfoServiceImpl.java

@@ -314,7 +314,7 @@ public class RegUnitInfoServiceImpl extends BaseService<RegUnitInfoDto, RegUnitI
             List<Long> roleIds = new ArrayList<>();
             Set<String> roleNameSet = new HashSet<>();
             // 3.1创建公司
-            companyInfo.setAddress(regUnitInfo.getProvince() + regUnitInfo.getCity() + regUnitInfo.getDistrict() + regUnitInfo.getStree() + regUnitInfo.getCommunity() + regUnitInfo.getAddress());
+            companyInfo.setAddress(dealNull2EmptyString(regUnitInfo.getProvince()) + dealNull2EmptyString(regUnitInfo.getCity()) + dealNull2EmptyString(regUnitInfo.getDistrict()) + dealNull2EmptyString(regUnitInfo.getStree()) + dealNull2EmptyString(regUnitInfo.getCommunity()) + dealNull2EmptyString(regUnitInfo.getAddress()));
             companyInfo.setAgencyCode("tzs");
             companyInfo.setParentId(Long.parseLong(regUnitInfo.getManagementUnitId()));
             companyInfo.setLevel("company");
@@ -386,4 +386,8 @@ public class RegUnitInfoServiceImpl extends BaseService<RegUnitInfoDto, RegUnitI
             throw new RuntimeException(e.getMessage());
         }
     }
+
+    private String dealNull2EmptyString( String t){
+        return StringUtils.isEmpty(t) ? "" : t;
+    }
 }
\ No newline at end of file