1.管辖机构树调整为默认账号的机构的单位信息

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

@@ -191,8 +191,9 @@ public class RegUnitInfoServiceImpl extends BaseService<RegUnitInfoDto, RegUnitI
 
     @Override
     public Collection getManagementUnitTree() {
+        tzsAuthServiceImpl.setRequestContext();
         // 组织架构中单位级别为：省级、地市级、区县级的单位
-        Collection<CompanyModel> companyModels = Privilege.companyClient.companyTreeWithoutAuth().getResult();
+        List<CompanyModel> companyModels = (List<CompanyModel>) Privilege.companyClient.queryAgencyTree(null).getResult();
         return companyModels.stream().filter(c -> "headquarter".equals(c.getLevel()) || "prefecture-level".equals(c.getLevel()) || "county".equals(c.getLevel())).map(this::dealChildCompany).collect(Collectors.toList());
     }
 
@@ -228,7 +229,7 @@ public class RegUnitInfoServiceImpl extends BaseService<RegUnitInfoDto, RegUnitI
     }
 
     private CompanyModel dealChildCompany(CompanyModel cm) {
-        cm.setChildren(this.getFilterChild(cm.getChildren()));
+        cm.setChildren(this.getFilterChild(cm.getChildren() != null ? cm.getChildren() : new ArrayList()));
         cm.getChildren().stream().filter(n -> {
             CompanyModel c = JSONObject.parseObject(JSON.toJSONString(n), CompanyModel.class);
             return "headquarter".equals(c.getLevel()) || "prefecture-level".equals(c.getLevel()) || "county".equals(c.getLevel());