Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
黄嘉阳
/
iot-platform-server
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
96c93613
authored
Oct 10, 2023
by
李小龙
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
fix: 用户详情接口增加租户信息
parent
0a0c2bd4
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
2 deletions
server-service/src/main/java/com/makeit/service/platform/auth/impl/PlatUserServiceImpl.java
server-service/src/main/java/com/makeit/vo/platform/auth/PlatPersonDTOVO.java
server-service/src/main/java/com/makeit/service/platform/auth/impl/PlatUserServiceImpl.java
View file @
96c93613
...
@@ -909,6 +909,9 @@ public class PlatUserServiceImpl extends ServiceImpl<PlatUserMapper, PlatUser>
...
@@ -909,6 +909,9 @@ public class PlatUserServiceImpl extends ServiceImpl<PlatUserMapper, PlatUser>
fillDept
(
Arrays
.
asList
(
userVO
));
fillDept
(
Arrays
.
asList
(
userVO
));
getRoleList
(
userVO
);
getRoleList
(
userVO
);
PlatTenant
platTenant
=
platTenantService
.
getById
(
userVO
.
getTenantId
());
userVO
.
setPlatTenant
(
platTenant
);
return
userVO
;
return
userVO
;
}
}
...
...
server-service/src/main/java/com/makeit/vo/platform/auth/PlatPersonDTOVO.java
View file @
96c93613
...
@@ -3,7 +3,8 @@ package com.makeit.vo.platform.auth;
...
@@ -3,7 +3,8 @@ package com.makeit.vo.platform.auth;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
com.fasterxml.jackson.annotation.JsonProperty
;
import
com.fasterxml.jackson.annotation.JsonProperty
;
import
com.makeit.common.dto.BaseIdDTO
;
import
com.makeit.common.dto.BaseTenantDTO
;
import
com.makeit.entity.saas.PlatTenant
;
import
com.makeit.module.admin.dto.plat.PlatRoleDTOVO
;
import
com.makeit.module.admin.dto.plat.PlatRoleDTOVO
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
io.swagger.annotations.ApiModelProperty
;
...
@@ -17,7 +18,7 @@ import java.util.List;
...
@@ -17,7 +18,7 @@ import java.util.List;
@ApiModel
(
"租户账号 新增 编辑 详情"
)
@ApiModel
(
"租户账号 新增 编辑 详情"
)
@Data
@Data
public
class
PlatPersonDTOVO
extends
Base
Id
DTO
{
public
class
PlatPersonDTOVO
extends
Base
Tenant
DTO
{
@NotBlank
(
message
=
"用户名不能为空"
)
@NotBlank
(
message
=
"用户名不能为空"
)
@Size
(
max
=
64
,
message
=
"用户名最长为64字符"
)
@Size
(
max
=
64
,
message
=
"用户名最长为64字符"
)
...
@@ -92,6 +93,9 @@ public class PlatPersonDTOVO extends BaseIdDTO {
...
@@ -92,6 +93,9 @@ public class PlatPersonDTOVO extends BaseIdDTO {
@ApiModelProperty
(
value
=
"角色名称,逗号拼接"
)
@ApiModelProperty
(
value
=
"角色名称,逗号拼接"
)
private
String
roleNameJoin
;
private
String
roleNameJoin
;
@ApiModelProperty
(
value
=
"租户信息"
)
private
PlatTenant
platTenant
;
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment