修改bug

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

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.common.biz.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.biz.common.utils.MenuFrom;
 import com.yeejoin.amos.boot.module.common.api.dto.ExcelDto;
 import com.yeejoin.amos.boot.module.common.api.dto.FireStationDto;
 import com.yeejoin.amos.boot.module.common.api.entity.FireStation;
@@ -139,4 +140,18 @@ public class FireStationController extends BaseController {
     public ResponseModel<List<FireStationDto>> selectForList() {
         return ResponseHelper.buildResponse(fireStationServiceImpl.queryForFireStationList(false));
     }
+
+    /**
+     * 查询机场单位
+     *
+     * @return
+     * @throws Exception
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/company/listTree", method = RequestMethod.GET)
+    @ApiOperation(httpMethod = "GET", value = "查询机场单位树", notes = "查询机场单位树")
+    public ResponseModel<List<MenuFrom>> listCompanyTree() throws Exception {
+        List<MenuFrom> menus = fireStationServiceImpl.getCompanyTeamTree();
+        return ResponseHelper.buildResponse(menus);
+    }
 }

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

@@ -3,8 +3,12 @@ package com.yeejoin.amos.boot.module.common.biz.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.google.common.collect.Lists;
+import com.yeejoin.amos.boot.biz.common.utils.MenuFrom;
+import com.yeejoin.amos.boot.biz.common.utils.TreeParser;
 import com.yeejoin.amos.boot.module.common.api.dto.FireStationDto;
 import com.yeejoin.amos.boot.module.common.api.dto.FireStationzhDto;
+import com.yeejoin.amos.boot.module.common.api.dto.FireTeamDto;
 import com.yeejoin.amos.boot.module.common.api.dto.RequestData;
 import com.yeejoin.amos.boot.module.common.api.entity.FireStation;
 import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
@@ -14,6 +18,7 @@ import com.yeejoin.amos.boot.module.common.api.service.IFireStationService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.typroject.tyboot.core.foundation.utils.Bean;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.annotation.Condition;
 import org.typroject.tyboot.core.rdbms.annotation.Operator;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
@@ -36,7 +41,8 @@ public class FireStationServiceImpl extends BaseService<FireStationDto, FireStat
     FireStationMapper fireStationMapper;
     @Autowired
     OrgUsrMapper orgUsrMapper;
-
+    @Autowired
+    OrgUsrServiceImpl orgUsrService;
     /**
      * 分页查询
      */
@@ -143,4 +149,28 @@ public class FireStationServiceImpl extends BaseService<FireStationDto, FireStat
     	wrapper.select(FireStation::getSequenceNbr,FireStation::getName);
     	return  this.baseMapper.selectMaps(wrapper);
     }
+
+    /**
+     * 获取机场单位树
+     * chenzhao 2021-10-14
+     * @return
+     */
+    public List<MenuFrom> getCompanyTeamTree() throws Exception {
+        MenuFrom root = new MenuFrom("-1", "微型消防站", null, null);
+
+        List<OrgUsr> companyDeptList = orgUsrService.selectCompanyList();
+        List<MenuFrom> companyDeptMenuList = Lists.newArrayList();
+        companyDeptList.forEach(o -> {
+            if (ValidationUtil.isEmpty(o.getParentId())) {
+                o.setParentId("-1");
+            }
+            companyDeptMenuList.add(new MenuFrom(o.getSequenceNbr().toString(), o.getBizOrgName(), o.getParentId(),
+                    "1"));
+        });
+
+        List<MenuFrom> menuList = TreeParser.getTreexin("-1", companyDeptMenuList, MenuFrom.class.getName(), "getKey",
+                1, "getName", "getParentId", "getNodeType");
+        root.setChildren(menuList);
+        return Lists.newArrayList(root);
+    }
 }