Merge branch 'developer' of http://36.40.66.175:5000/moa/jxdj_zx/amos-boot-zx-biz into developer

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

@@ -911,6 +911,17 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
        qu.eq(RegionalCompanies::getUnitId,unitInfo.getAmosCompanySeq());
        List<RegionalCompanies> oldList = regionalCompaniesMapper.selectList(qu);
        regionalCompaniesMapper.delete(qu);
+
+       List<String> oldDisString = oldList.stream().map((regionalCompanies) -> regionalCompanies.getRegionalCompaniesSeq().toString()).collect(Collectors.toList());
+       List<String> newDisString = dis.stream().map((regionalCompaniesSeq) -> regionalCompaniesSeq.toString()).collect(Collectors.toList());
+
+       for(String item:oldDisString){
+           if(!newDisString.contains(item)){
+               throw new BadRequest("所属区域公司只能增加, 不能删除");
+           }
+       }
+
+
        List<RegionalCompanies> regionalComp= new ArrayList<>();
        FeignClientResult<Collection<CompanyModel>> feignClientResult=  Privilege.companyClient.querySubAgencyTree(regionalCompanies);
        List<CompanyModel>  companyModel = (List<CompanyModel>)feignClientResult.getResult();