修改bug

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/SpecialPositionStaffServiceImpl.java

@@ -14,8 +14,11 @@ import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 特岗人员服务实现类
@@ -68,12 +71,30 @@ public class SpecialPositionStaffServiceImpl extends BaseService<SpecialPosition
         // 查询已有数据的岗位类型
         List<Long> positionStaffCodeList = this.baseMapper.getPositionStaffCodeList(false,companyId);
         // 排除已有数据的，返回
+        /*bug 3483 陈召 2021-11-18 开始*/
         for (int i = 0; i < menuList.size(); i++) {
+            //排除父岗位是否已有 有就删除
             if (positionStaffCodeList.contains(Long.valueOf(menuList.get(i).getKey()))) {
                 menuList.remove(i);
                 i--;
             }
+            //排除子岗位是否已有 有就删除
+            if (null != menuList.get(i).getChildren() && menuList.get(i).getChildren().size() > 0){
+                List<MenuFrom> children = menuList.get(i).getChildren();
+                for (int j= 0; j < children.size(); j++) {
+                    if (positionStaffCodeList.contains(Long.valueOf(children.get(j).getKey()))) {
+                        menuList.get(i).getChildren().remove(j);
+                        j--;
+                    }
+                    //当子岗位全部删除时 父岗位也删除
+                    if (children.size() == 0){
+                        menuList.remove(i);
+                        i--;
+                    }
+                }
+            }
         }
+        /*bug 3483 陈召 2021-11-18 结束*/
         HashMap<Object, Object> objectObjectHashMap = new HashMap<>();
         objectObjectHashMap.put("GWMC", menuList);
         return objectObjectHashMap;