Merge branch 'developer' into wofkflow0620

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

@@ -849,8 +849,21 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
         //验证二维码
         UnitInfo unitInfo=new UnitInfo();
         unitInfo= unitInfoMapper.selectById(unitDataDto.getUnitInformation().getSequenceNbr());
-       List<String> lisk=new ArrayList<>();
        UnitInformation unitInformation= unitDataDto.getUnitInformation();
+       List<Long> dis= unitInformation.getRegionalCompaniesSeq();
+       //区域公司
+       LambdaQueryWrapper<RegionalCompanies> qu=new LambdaQueryWrapper<>();
+       qu.eq(RegionalCompanies::getUnitId,unitInfo.getAmosCompanySeq());
+       List<RegionalCompanies> oldList = regionalCompaniesMapper.selectList(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<String> lisk=new ArrayList<>();
        JSONArray regionName = getRegionName();
        List<RegionModel> list = JSONArray.parseArray(regionName.toJSONString(), RegionModel.class);
            List<Integer> regist= unitInformation.getRegisterPcdCodeList();
@@ -891,7 +904,7 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
        unitInformation.setRegisterPcdCodeList(unitInformation.getRegisterPcdCodeList());
        unitInformation.setWorkPcdCodeList(unitInformation.getWorkPcdCodeList());
 
-      List<Long> dis= unitInformation.getRegionalCompaniesSeq();
+
        List<String>  disST=   dis.stream().map(x->x+"").collect(Collectors.toList());
        BeanUtils.copyProperties(unitInformation,unitInfo);
         CommerceInfo commerceInfo=new  CommerceInfo();
@@ -906,17 +919,7 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
         unitInfoMapper.updateById(unitInfo);
         commerceInfoMapper.updateById(commerceInfo);
 
-       //区域公司
-       LambdaQueryWrapper<RegionalCompanies> qu=new LambdaQueryWrapper<>();
-       qu.eq(RegionalCompanies::getUnitId,unitInfo.getAmosCompanySeq());
-       List<RegionalCompanies> oldList = regionalCompaniesMapper.selectList(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("所属区域公司只能增加, 不能删除");
-           }
-       }
+
        regionalCompaniesMapper.delete(qu);