Merge remote-tracking branch 'origin/develop_dl_plan6' into develop_dl_plan6_temp

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

@@ -884,7 +884,7 @@ public class FireFightingSystemController extends AbstractBaseController {
     @ApiOperation(httpMethod = "GET", value = "获取系统分类树", notes = "获取系统分类树")
     @GetMapping(value = "/systemAndEquipmentTreeByBziOrgCode")
     public List<OrgMenuDto> systemAndEquipmentTreeByBziOrgCode() {
-        return fireFightingSystemService.systemAndEquipmentTreeByBziOrgCode(bizOrgCode);
+        return fireFightingSystemService.systemAndEquipmentTreeByBziOrgCode();
     }
 
     /**

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

@@ -298,7 +298,7 @@ public interface IFireFightingSystemService extends IService<FireFightingSystemE
     List<Map<String, Object>> getSystemRunningInfoList();
 
     Page<FireFightingSystemDto> fireSysRunStatusPage(Page<Map<String, Object>> page, String bizOrgCode);
-    List<OrgMenuDto> systemAndEquipmentTreeByBziOrgCode(String bizOrgCode);
+    List<OrgMenuDto> systemAndEquipmentTreeByBziOrgCode();
 
     Map<String, Object> getSystemDetailByCode(String systemCode);
 

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

@@ -2103,7 +2103,9 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
     }
 
     @Override
-    public List<OrgMenuDto> systemAndEquipmentTreeByBziOrgCode(String bizOrgCode) {
+    public List<OrgMenuDto> systemAndEquipmentTreeByBziOrgCode() {
+        FeignClientResult<List<OrgUsrDto>> feignClientResult = jcsFeignClient.getCompanyDeptListWithAuth(authKey, "COMPANY", "dl");
+        String bizOrgCode = feignClientResult.getResult().get(0).getBizOrgCode();
         List<Map<String, Object>> list = fireFightingSystemMapper.systemAndEquipment(bizOrgCode);
         return systemAndEquipmentTree(list);
     }