孔村移除掉党总支 并给孔村镇 降级为街道

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java

@@ -50,10 +50,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
+import java.util.*;
 
 /**
  * 组织相关api
@@ -536,14 +533,21 @@ public class AgencyServiceImpl implements AgencyService {
             } while (true);
             //多客户 获取所有下级
             List<ScreenCustomerAgencyDTO> agencyNodeDTOS = screenCustomerAgencyDao.selectAllSubAgencyList(null,staffAgencyDTO.getAreaCode());
-            //孔村降级处理
+            //孔村降级处理 且移除掉 党总支级别
             String KONG_CUN_AGENCY_ID = "1234085031077498881";
-            agencyNodeDTOS.forEach(e->{
+            Iterator<ScreenCustomerAgencyDTO> iterator = agencyNodeDTOS.iterator();
+            while (iterator.hasNext()){
+                ScreenCustomerAgencyDTO e = iterator.next();
                 if (e.getPids().contains(KONG_CUN_AGENCY_ID)){
-                    e.setLevel(OrgLevelEnum.getSubOrgLevel(e.getLevel()));
+                    if (OrgLevelEnum.STREET.getCode().equals(e.getLevel())){
+                        iterator.remove();
+                    }
+                    if (KONG_CUN_AGENCY_ID.equals(e.getAgencyId())){
+                        e.setLevel(OrgLevelEnum.getSubOrgLevel(e.getLevel()));
+                    }
                 }
                 convertOrgTreeNode(nodeList, e);
-            });
+            }
             nodes = TreeUtils.buildTreeByAreaCode(nodeList);
         }
         //只有一个根节点的树 所以返回一个