Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
MaxKey单点登录官方(MaxKeyTop)
MaxKey
提交
01a70fcb
MaxKey
项目概览
MaxKey单点登录官方(MaxKeyTop)
/
MaxKey
8 个月 前同步成功
通知
75
Star
3
Fork
1
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
MaxKey
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
01a70fcb
编写于
8月 19, 2023
作者:
M
MaxKey
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
前端代码适配springboot3微调
上级
7e71d8dd
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
15 addition
and
7 deletion
+15
-7
maxkey-web-frontend/maxkey-web-app/src/app/service/base.service.ts
...b-frontend/maxkey-web-app/src/app/service/base.service.ts
+5
-1
maxkey-web-frontend/maxkey-web-mgt-app/src/app/service/base.service.ts
...ontend/maxkey-web-mgt-app/src/app/service/base.service.ts
+3
-0
maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/contorller/OrganizationsController.java
...romara/maxkey/web/contorller/OrganizationsController.java
+4
-3
maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/permissions/contorller/ResourcesController.java
...axkey/web/permissions/contorller/ResourcesController.java
+3
-3
未找到文件。
maxkey-web-frontend/maxkey-web-app/src/app/service/base.service.ts
浏览文件 @
01a70fcb
...
...
@@ -82,7 +82,11 @@ export class BaseService<T> {
}
get
(
id
:
String
):
Observable
<
Message
<
T
>>
{
return
this
.
http
.
get
<
Message
<
T
>>
(
`
${
this
.
server
.
urls
.
base
+
this
.
server
.
urls
.
get
}
/
${
id
}
`
);
if
(
id
===
null
||
id
===
''
)
{
return
this
.
http
.
get
<
Message
<
T
>>
(
`
${
this
.
server
.
urls
.
base
+
this
.
server
.
urls
.
get
}
`
);
}
else
{
return
this
.
http
.
get
<
Message
<
T
>>
(
`
${
this
.
server
.
urls
.
base
+
this
.
server
.
urls
.
get
}
/
${
id
}
`
);
}
}
getByParams
(
params
:
NzSafeAny
,
getURL
?:
string
):
Observable
<
Message
<
T
>>
{
...
...
maxkey-web-frontend/maxkey-web-mgt-app/src/app/service/base.service.ts
浏览文件 @
01a70fcb
...
...
@@ -84,6 +84,9 @@ export class BaseService<T> {
}
get
(
id
:
String
):
Observable
<
Message
<
T
>>
{
if
(
id
===
null
||
id
===
''
)
{
return
this
.
http
.
get
<
Message
<
T
>>
(
`
${
this
.
server
.
urls
.
base
+
this
.
server
.
urls
.
get
}
`
);
}
return
this
.
http
.
get
<
Message
<
T
>>
(
`
${
this
.
server
.
urls
.
base
+
this
.
server
.
urls
.
get
}
/
${
id
}
`
);
}
...
...
maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/contorller/OrganizationsController.java
浏览文件 @
01a70fcb
...
...
@@ -41,6 +41,7 @@ import org.dromara.maxkey.util.ExcelUtils;
import
org.dromara.maxkey.web.component.TreeAttributes
;
import
org.dromara.maxkey.web.component.TreeNode
;
import
org.dromara.mybatis.jpa.entity.JpaPageResults
;
import
org.dromara.mybatis.jpa.query.Query
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.springframework.beans.factory.annotation.Autowired
;
...
...
@@ -153,9 +154,9 @@ public class OrganizationsController {
@ResponseBody
@RequestMapping
(
value
={
"/tree"
},
produces
=
{
MediaType
.
APPLICATION_JSON_VALUE
})
public
ResponseEntity
<?>
tree
(
@ModelAttribute
Organizations
organization
,
@CurrentUser
UserInfo
currentUser
)
{
_logger
.
debug
(
"-
query
{}"
,
organization
);
organization
.
setInstId
(
currentUser
.
getInstId
());
List
<
Organizations
>
orgList
=
organizationsService
.
query
(
organization
);
_logger
.
debug
(
"-
tree
{}"
,
organization
);
List
<
Organizations
>
orgList
=
organizationsService
.
query
(
Query
.
builder
().
eq
(
"instid"
,
currentUser
.
getInstId
())
);
if
(
orgList
!=
null
)
{
TreeAttributes
treeAttributes
=
new
TreeAttributes
();
int
nodeCount
=
0
;
...
...
maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/permissions/contorller/ResourcesController.java
浏览文件 @
01a70fcb
...
...
@@ -31,6 +31,7 @@ import org.dromara.maxkey.persistence.service.ResourcesService;
import
org.dromara.maxkey.web.component.TreeAttributes
;
import
org.dromara.maxkey.web.component.TreeNode
;
import
org.dromara.mybatis.jpa.entity.JpaPageResults
;
import
org.dromara.mybatis.jpa.query.Query
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.springframework.beans.factory.annotation.Autowired
;
...
...
@@ -141,9 +142,8 @@ public class ResourcesController {
@ResponseBody
@RequestMapping
(
value
={
"/tree"
},
produces
=
{
MediaType
.
APPLICATION_JSON_VALUE
})
public
ResponseEntity
<?>
tree
(
@ModelAttribute
Resources
resource
,
@CurrentUser
UserInfo
currentUser
)
{
_logger
.
debug
(
"-query {}"
,
resource
);
resource
.
setInstId
(
currentUser
.
getInstId
());
List
<
Resources
>
resourceList
=
resourcesService
.
query
(
resource
);
_logger
.
debug
(
"-tree {}"
,
resource
);
List
<
Resources
>
resourceList
=
resourcesService
.
query
(
Query
.
builder
().
eq
(
"instid"
,
currentUser
.
getInstId
()));
if
(
resourceList
!=
null
)
{
TreeAttributes
treeAttributes
=
new
TreeAttributes
();
int
nodeCount
=
0
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录