提交区域树通过bizOrgCode过滤

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

@@ -6,6 +6,7 @@ import com.yeejoin.amos.boot.biz.common.dto.OrgMenuDto;
 import com.yeejoin.equipmanage.common.dto.AreaDto;
 import com.yeejoin.equipmanage.common.entity.Area;
 import com.yeejoin.equipmanage.common.vo.AreaResquest;
+import com.yeejoin.equipmanage.common.vo.AreaTreeVo;
 import com.yeejoin.equipmanage.common.vo.UnitAreaTreeVo;
 import com.yeejoin.equipmanage.service.IAreaService;
 import io.swagger.annotations.Api;
@@ -33,15 +34,15 @@ public class AreaController extends AbstractBaseController {
     @Autowired
     IAreaService iAreaService;
 
-//	/**
-//	 * 获取区域树
-//	 */
-//	@TycloudOperation(ApiLevel = UserType.AGENCY)
-//	@ApiOperation("区域树")
-//	@GetMapping(value = "/tree")
-//	public List<AreaTreeVo> getAreaTree() {
-//		return iAreaService.getAreaTreeVo();
-//	}
+	/**
+	 * 获取区域树通过bizOrgCode过滤
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation("区域树")
+	@GetMapping(value = "/areaTree")
+	public List<UnitAreaTreeVo> getAreaTree(@RequestParam(required = false) String bizOrgCode) {
+		return iAreaService.getAreaTreeVoByBizOrgCode(bizOrgCode);
+	}
 
     /**
      * 获取公司部门区域树

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

@@ -7,6 +7,7 @@ import com.yeejoin.amos.boot.biz.common.dto.OrgMenuDto;
 import com.yeejoin.equipmanage.common.dto.AreaDto;
 import com.yeejoin.equipmanage.common.entity.Area;
 import com.yeejoin.equipmanage.common.vo.AreaResquest;
+import com.yeejoin.equipmanage.common.vo.AreaTreeVo;
 import com.yeejoin.equipmanage.common.vo.UnitAreaTreeVo;
 
 import java.util.List;
@@ -23,7 +24,7 @@ public interface IAreaService extends IService<Area> {
      * 获取区域树
      * @return
      */
-//    List<AreaTreeVo> getAreaTreeVo();
+    List<UnitAreaTreeVo> getAreaTreeVoByBizOrgCode(String bizOrgCode);
 
     List<UnitAreaTreeVo> getAreaTreeVoById(long id, String bizOrgCode);
 

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

@@ -72,27 +72,57 @@ public class AreaServiceImpl extends ServiceImpl<AreaMapper, Area> implements IA
     private String authKey;
 
 
-//    @Override
-//    public List<UnitAreaTreeVo> getAreaTreeVo() {
-//        List<UnitAreaTreeVo> areaTreeList = new ArrayList<>();
-//        // 查询平台区域数据字典
-//        FeignClientResult<List<DictionarieValueModel>> dictValues = Systemctl.dictionarieClient.dictValues(areaType);
-//        if (dictValues != null) {
-//            List<DictionarieValueModel> values = dictValues.getResult();
-//            // 根据区域类型查询子节点
-//            if (values != null && values.size() > 0) {
-//                for (DictionarieValueModel dictionarieValueModel : values) {
-//                    UnitAreaTreeVo areaTreeVo = new UnitAreaTreeVo();
-//                    long parentId = Long.parseLong(dictionarieValueModel.getDictDataKey());
-//                    areaTreeVo.setId(parentId);
-//                    areaTreeVo.setName(dictionarieValueModel.getDictDataValue());
-//                    areaTreeVo.setChildren(getChildren(parentId));
-//                    areaTreeList.add(areaTreeVo);
-//                }
-//            }
-//        }
-//        return areaTreeList;
-//    }
+    @Override
+    public List<UnitAreaTreeVo> getAreaTreeVoByBizOrgCode(String bizOrgCode) {
+        List<UnitAreaTreeVo> areaTreeList = new ArrayList<>();
+        // 查询平台区域数据字典
+        FeignClientResult<List<DictionarieValueModel>> dictValues = Systemctl.dictionarieClient.dictValues(areaType);
+        if (dictValues != null) {
+            List<DictionarieValueModel> values = dictValues.getResult();
+            // 根据区域类型查询子节点
+            if (values != null && values.size() > 0) {
+                for (DictionarieValueModel dictionarieValueModel : values) {
+                    UnitAreaTreeVo areaTreeVo = new UnitAreaTreeVo();
+                    long parentId = Long.parseLong(dictionarieValueModel.getDictDataKey());
+                    areaTreeVo.setId(parentId);
+                    areaTreeVo.setName(dictionarieValueModel.getDictDataValue());
+                    areaTreeVo.setChildren(getChildrenByBizOrgCode(parentId, bizOrgCode));
+                    areaTreeList.add(areaTreeVo);
+                }
+            }
+        }
+        return areaTreeList;
+    }
+
+    /**
+     * 根据父节点和bizOrgCode查询子节点赋值
+     *
+     * @param parentId
+     * @return
+     */
+    public List<UnitAreaTreeVo> getChildrenByBizOrgCode(Long parentId, String bizOrgCode) {
+        List<UnitAreaTreeVo> areaTreeVos = new ArrayList<>();
+        LambdaQueryWrapper<Area> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(Area::getParentId, parentId);
+        queryWrapper.eq(Area::getIsDelete, false);
+        if (StringUtil.isNotEmpty(bizOrgCode)) {
+            queryWrapper.like(Area::getBizOrgCode, bizOrgCode);
+        }
+        List<Area> areas = this.baseMapper.selectList(queryWrapper);
+        if (areas != null && areas.size() > 0) {
+            for (Area area : areas) {
+                UnitAreaTreeVo areaTreeVo = new UnitAreaTreeVo();
+                areaTreeVo.setId(area.getId());
+                areaTreeVo.setName(area.getName());
+                areaTreeVo.setBizOrgCode(area.getOrgCode());
+                areaTreeVo.setParentId(parentId);
+                // 查询子节点赋值
+                areaTreeVo.setChildren(getChildren(area.getId()));
+                areaTreeVos.add(areaTreeVo);
+            }
+        }
+        return areaTreeVos;
+    }
 
     @Override
     public List<UnitAreaTreeVo> getAreaTreeVoById(long id, String bizOrgCode) {