From 935fda56e95270493d9e3e46d28b29125d330ca3 Mon Sep 17 00:00:00 2001
From: liusuyi <1951119284@qq.com>
Date: 星期一, 29 七月 2024 16:31:02 +0800
Subject: [PATCH] 修改：流媒体转码使用ffmpeg绝对路径，配置文件中增加ffmpegPath 增加：部门列表查询和部门详情查询无数据权限
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeSelectWell.java | 23 +++--------------------
1 files changed, 3 insertions(+), 20 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeSelectWell.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeSelectWell.java
index df3a0bc..173bc1e 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeSelectWell.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeSelectWell.java
@@ -7,6 +7,7 @@
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
import java.util.stream.Collectors;
/**
@@ -25,36 +26,18 @@
private String label;
/** 瀛愯妭鐐� */
- @JsonInclude(JsonInclude.Include.NON_EMPTY)
- private List<TreeSelectWell> children;
-
- public List<HealthVo> getWell() {
- return well;
- }
-
- public void setWell(List<HealthVo> well) {
- this.well = well;
- }
-
- private List<HealthVo> well = new ArrayList<>();
+ private List<TreeSelectWell> children = new ArrayList<>();
public TreeSelectWell()
{
}
- public TreeSelectWell(SysDept dept)
+ public TreeSelectWell(TreeDeptWell dept)
{
this.id = dept.getDeptId();
this.label = dept.getDeptName();
this.children = dept.getChildren().stream().map(TreeSelectWell::new).collect(Collectors.toList());
- }
-
- public TreeSelectWell(SysMenu menu)
- {
- this.id = menu.getMenuId();
- this.label = menu.getMenuName();
- this.children = menu.getChildren().stream().map(TreeSelectWell::new).collect(Collectors.toList());
}
public Long getId()
--
Gitblit v1.9.3