替换部门树为无权限树

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/OrgUsrController.java

@@ -493,6 +493,16 @@ public class OrgUsrController extends BaseController {
 		return ResponseHelper.buildResponse(menus);
 	}
 
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@RequestMapping(value = "/companyTreeByUserAndTypeToPartol", method = RequestMethod.GET)
+	@ApiOperation(httpMethod = "GET", value = "根据登录人及类型获取公司部门树", notes = "根据登录人及类型获取公司部门树")
+	public ResponseModel<List<OrgMenuDto>> companyTreeByUserAndTypeToPartol() {
+		// 获取登陆人角色
+		ReginParams reginParams = getSelectedOrgInfo();
+		List<OrgMenuDto> menus = iOrgUsrService.companyTreeByUserNumber(reginParams);
+		return ResponseHelper.buildResponse(menus);
+	}
+
 	@PersonIdentify
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@RequestMapping(value = "/companyTreeByUserCurrent", method = RequestMethod.GET)

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/AreaController.java

@@ -56,6 +56,19 @@ public class AreaController extends AbstractBaseController {
         return iAreaService.getAreaTreeListVo();
     }
 
+
+    /**
+     * 获取公司部门区域树
+     *
+     * @return list
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "根据登陆人获取单位区域树", notes = "根据登陆人获取单位区域树")
+    @GetMapping(value = "/treeToPartol")
+    public List<UnitAreaTreeVo> getSystemTreeToPartol() {
+        return iAreaService.getAreaTreeListVoNew();
+    }
+
     /**
      * 获取公司部门树
      *

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/fegin/JcsFeign.java

@@ -145,6 +145,10 @@ public interface JcsFeign {
     @GetMapping(value = "/org-usr/{authKey}/listWithAuth")
     FeignClientResult<List<OrgUsrDto>> getCompanyDeptListWithAuth(@PathVariable(value = "authKey") String authKey, @RequestParam(value = "orgTypes", required = false) String orgTypes);
 
+    @GetMapping(value = "/org-usr/{authKey}/listWithAuthToPartol")
+    FeignClientResult<List<OrgUsrDto>> getCompanyDeptListWithAuthToPartol(@PathVariable(value = "authKey") String authKey, @RequestParam(value = "orgTypes", required = false) String orgTypes);
+
+
     /**
      * 获取机场人员
      *

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/IAreaService.java

@@ -41,6 +41,8 @@ public interface IAreaService extends IService<Area> {
      */
     List<UnitAreaTreeVo> getAreaTreeListVo();
 
+    List<UnitAreaTreeVo> getAreaTreeListVoNew();
+
 
     /**
      * 根据登录人公司树

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/AreaServiceImpl.java

@@ -236,6 +236,50 @@ public class AreaServiceImpl extends ServiceImpl<AreaMapper, Area> implements IA
     }
 
     @Override
+    public List<UnitAreaTreeVo> getAreaTreeListVoNew() {
+        // 获取公司list
+        List<OrgUsrDto> orgCompanyLists = jcsRemoteService.getlistCompanyTree("COMPANY");
+   //     List<OrgUsrDto> orgCompanyLists = jcsRemoteService.getCompanyDeptListWithAuth(authKey, "COMPANY");
+        if (orgCompanyLists.isEmpty()) {
+            return new ArrayList<>();
+        }
+        Map<String, Long> orgMap = orgCompanyLists.stream().collect(Collectors.toMap(OrgUsrDto::getBizOrgCode, OrgUsrDto::getSequenceNbr));
+        List<UnitAreaTreeVo> orgTreeList = orgCompanyLists.stream()
+                .map(orgUsrDto -> {
+                    UnitAreaTreeVo vo = new UnitAreaTreeVo();
+                    vo.setId((orgUsrDto.getSequenceNbr()));
+                    vo.setName(orgUsrDto.getBizOrgName());
+                    vo.setType(orgUsrDto.getBizOrgType());
+                    vo.setBizOrgCode(orgUsrDto.getBizOrgCode());
+                    vo.setBizOrgName(orgUsrDto.getBizOrgName());
+                    vo.setParentId(StringUtil.isNotEmpty(orgUsrDto.getParentId()) ? Long.parseLong(orgUsrDto.getParentId()) : 0);
+                    return vo;
+                }).collect(Collectors.toList());
+
+        // 根据bizOrgCode获取区域list
+        List<String> bizOrgCodes = orgTreeList.stream().map(UnitAreaTreeVo::getBizOrgCode).collect(Collectors.toList());
+        LambdaQueryWrapper<Area> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(Area::getIsDelete, false);
+        wrapper.in(Area::getBizOrgCode, bizOrgCodes);
+        List<Area> areaEntityList = this.baseMapper.selectList(wrapper);
+        List<UnitAreaTreeVo> areaTreeVoList = areaEntityList.stream()
+                .map(area -> {
+                    UnitAreaTreeVo vo = new UnitAreaTreeVo();
+                    vo.setId(area.getId());
+                    vo.setName(area.getName());
+                    vo.setType("area");
+                    vo.setBizOrgCode(area.getBizOrgCode());
+                    vo.setBizOrgName(area.getBizOrgName());
+                    vo.setParentId(area.getParentId().equals(0L) ? orgMap.get(area.getBizOrgCode()) : area.getParentId());
+                    return vo;
+                }).collect(Collectors.toList());
+        orgTreeList.addAll(areaTreeVoList);
+        return orgTreeList.stream().filter(o -> orgTreeList.stream().noneMatch(a -> a.getId().equals(o.getParentId()))).peek(a -> {
+            a.setChildren(getChildrenFromData(a.getId(), orgTreeList));
+        }).collect(Collectors.toList());
+    }
+
+    @Override
     public List<UnitAreaTreeVo> getAreaTreeListVo() {
         // 获取公司list
         List<OrgUsrDto> orgCompanyLists = jcsRemoteService.getCompanyDeptListWithAuth(authKey, "COMPANY");

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/feign/EquipFeign.java

@@ -36,7 +36,7 @@ public interface EquipFeign {
      *  所属局域树
      * @return
      */
-    @RequestMapping(value = "${equip.fegin.prefix}"+"/area/tree", method = RequestMethod.GET ,consumes="application/json")
+    @RequestMapping(value = "${equip.fegin.prefix}"+"/area/treeToPartol", method = RequestMethod.GET ,consumes="application/json")
     LinkedHashMap<String,Object> getRegionTress();