经销商系统设置-单位管理-区域信息编辑数据丢失

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

@@ -909,26 +909,44 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
        //区域公司
        LambdaQueryWrapper<RegionalCompanies> qu=new LambdaQueryWrapper<>();
        qu.eq(RegionalCompanies::getUnitId,unitInfo.getAmosCompanySeq());
+       List<RegionalCompanies> oldList = regionalCompaniesMapper.selectList(qu);
        regionalCompaniesMapper.delete(qu);
        List<RegionalCompanies> regionalComp= new ArrayList<>();
        FeignClientResult<Collection<CompanyModel>> feignClientResult=  Privilege.companyClient.querySubAgencyTree(regionalCompanies);
        List<CompanyModel>  companyModel = (List<CompanyModel>)feignClientResult.getResult();
        List<String>  lisd=unitInfo.getRegionalCompaniesSeq();
-       if(companyModel!=null&&!companyModel.isEmpty()&&lisd!=null&&!lisd.isEmpty()){
-           for (Object aLong : lisd) {
-               for (CompanyModel compan : companyModel) {
-                   if(compan.getSequenceNbr().longValue()==Long.valueOf(aLong.toString()).longValue()){
-                       RegionalCompanies re=  new RegionalCompanies(Long.valueOf(aLong.toString()), compan.getCompanyName(), compan.getOrgCode(), unitInfo.getAmosCompanySeq(),unitInfo.getSequenceNbr());
 
-                       lisk.add(compan.getOrgCode());
 
-                       regionalComp.add(re);
-                       continue;
+       if(oldList==null) {
+           oldList = new ArrayList<>();
+       }
+
+       if(companyModel!=null&&!companyModel.isEmpty()&&lisd!=null&&!lisd.isEmpty()){
+           for (Object aLong : lisd) {
+               RegionalCompanies oldRe = oldList.stream().filter(s -> Objects.equals(s.getRegionalCompaniesSeq().toString(), aLong.toString())).findFirst().orElse(null);
+               if(oldRe!= null) {
+                   lisk.add(oldRe.getRegionalCompaniesCode());
+                   regionalComp.add(oldRe);
+               }else {
+                   for (CompanyModel compan : companyModel) {
+                       if(compan.getSequenceNbr().longValue()==Long.valueOf(aLong.toString()).longValue()){
+                           RegionalCompanies re=  new RegionalCompanies(Long.valueOf(aLong.toString()), compan.getCompanyName(), compan.getOrgCode(), unitInfo.getAmosCompanySeq(),unitInfo.getSequenceNbr());
+                           lisk.add(compan.getOrgCode());
+                           regionalComp.add(re);
+                           continue;
+                       }
                    }
                }
-           }
 
+
+           }
        }
+
+
+
+
+
+
        regionalCompaniesService.saveBatch(regionalComp);
 
        //修改管理员权限