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
3fac5066
authored
Nov 01, 2023
by
李小龙
Committed by
huangjy
Nov 08, 2023
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
fix:29939 平台端-人员管理-导入:导入的角色要与组织相关联,非组织的角色需要提示,不允许导入成功
parent
55f2fddb
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderServiceImpl.java
server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderServiceImpl.java
View file @
3fac5066
...
...
@@ -361,7 +361,7 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder
@Override
@Transactional
public
ExcelImportVo
importExcel
(
MultipartFile
excelFile
)
throws
Exception
{
PlatUserVO
userVO
=
PlatUserUtil
.
getUserVO
();
List
<
PlatElderImportDTO
>
list
=
ExcelUtil
.
importExcel
(
null
,
3
,
excelFile
,
PlatElderImportDTO
.
class
);
List
<
String
>
spaceNameList
=
list
.
stream
().
flatMap
(
e
->
Stream
.
of
(
...
...
@@ -374,7 +374,7 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder
)).
collect
(
Collectors
.
toList
());
List
<
PlatSpace
>
spaceList
=
platSpaceService
.
list
(
new
QueryWrapper
<
PlatSpace
>().
lambda
()
.
in
(
PlatSpace:
:
getName
,
spaceNameList
));
.
in
(
PlatSpace:
:
getName
,
spaceNameList
)
.
eq
(
PlatSpace:
:
getOrgId
,
userVO
.
getOrgId
())
);
List
<
TreeDTOVO
>
treeList
=
BeanDtoVoUtils
.
listVo
(
spaceList
,
TreeDTOVO
.
class
);
...
...
@@ -418,7 +418,7 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder
TreeDTOVO:
:
getParentId
,
Collectors
.
toMap
(
TreeDTOVO:
:
getName
,
Function
.
identity
(),(
v1
,
v2
)
->
v2
)
));
List
<
SysConfigVO
>
sysConfigVOS1
=
sysConfigService
.
viewListByCategoryCode
(
SysConfigCategoryConst
.
ELDER_CERTIFICATE_TYPE
);
//
List<SysConfigVO> sysConfigVOS1 = sysConfigService.viewListByCategoryCode(SysConfigCategoryConst.ELDER_CERTIFICATE_TYPE);
ExcelImportVo
excelImportVo
=
ExcelValidatorUtil
.
validateMain
(
3
,
list
,
l
->
{
...
...
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