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

@@ -920,48 +920,68 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto, UnitInfo, Unit
         unitInfoMapper.updateById(unitInfo);
         commerceInfoMapper.updateById(commerceInfo);
 
-        //区域公司
-        LambdaQueryWrapper<RegionalCompanies> qu = new LambdaQueryWrapper<>();
-        qu.eq(RegionalCompanies::getUnitId, unitInfo.getAmosCompanySeq());
-        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;
-                    }
-                }
-            }
 
-        }
-        regionalCompaniesService.saveBatch(regionalComp);
-
-        //修改管理员权限
-        //管理员绑定角色权限
-        LambdaQueryWrapper<StdUserEmpower> uo = new LambdaQueryWrapper();
-        uo.eq(StdUserEmpower::getAmosUserId, unitInfo.getAdminUserId());
-        StdUserEmpower stdUserEmpower = userEmpowerMapper.selectOne(uo);
-
-        if (stdUserEmpower != null) {
-            stdUserEmpower.setAmosUserId(unitInfo.getAdminUserId());
-            stdUserEmpower.setAmosOrgCode(lisk);
-            userEmpowerMapper.updateById(stdUserEmpower);
-        } else {
-            stdUserEmpower = new StdUserEmpower();
-            stdUserEmpower.setAmosUserId(unitInfo.getAdminUserId());
-            stdUserEmpower.setAmosOrgCode(lisk);
-            stdUserEmpower.setPermissionType("HYGF");
-            userEmpowerMapper.insert(stdUserEmpower);
-        }
+       //区域公司
+       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(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);
+
+       //修改管理员权限
+       //管理员绑定角色权限
+       LambdaQueryWrapper<StdUserEmpower> uo=new LambdaQueryWrapper();
+       uo.eq(StdUserEmpower::getAmosUserId,unitInfo.getAdminUserId());
+       StdUserEmpower  stdUserEmpower= userEmpowerMapper.selectOne(uo);
+
+       if(stdUserEmpower!=null){
+           stdUserEmpower.setAmosUserId(unitInfo.getAdminUserId());
+           stdUserEmpower.setAmosOrgCode(lisk);
+           userEmpowerMapper.updateById(stdUserEmpower);
+       }else{
+           stdUserEmpower=new StdUserEmpower();
+           stdUserEmpower.setAmosUserId(unitInfo.getAdminUserId());
+           stdUserEmpower.setAmosOrgCode(lisk);
+           stdUserEmpower.setPermissionType("HYGF");
+           userEmpowerMapper.insert(stdUserEmpower);
+       }
+
 
 
         return true;