Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-boot-biz
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
项目统一框架
amos-boot-biz
Commits
122aec97
Commit
122aec97
authored
Apr 02, 2022
by
chenhao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug 4101 解决
parent
81bf8cf5
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
5 deletions
+7
-5
IOrgUsrService.java
...n/amos/boot/module/common/api/service/IOrgUsrService.java
+1
-1
OrgUsrController.java
...s/boot/module/common/biz/controller/OrgUsrController.java
+2
-1
OrgUsrServiceImpl.java
...oot/module/common/biz/service/impl/OrgUsrServiceImpl.java
+4
-3
No files found.
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/service/IOrgUsrService.java
View file @
122aec97
...
...
@@ -218,7 +218,7 @@ public interface IOrgUsrService {
/**
* 根据登陆人获取公司列表(关联重点部位)
*/
List
<
CheckObjectDto
>
companyListByUser
(
AgencyUserModel
user
);
List
<
CheckObjectDto
>
companyListByUser
(
AgencyUserModel
user
,
String
bizOrgCode
);
/**
* 获取登陆人关联机场单位人员信息,部门信息
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/OrgUsrController.java
View file @
122aec97
...
...
@@ -502,9 +502,10 @@ public class OrgUsrController extends BaseController {
@RequestMapping
(
value
=
"/companyListByUser"
,
method
=
RequestMethod
.
GET
)
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"根据登陆人获取单位列表"
,
notes
=
"根据登陆人获取单位列表"
)
public
ResponseModel
<
List
<
CheckObjectDto
>>
companyListByUser
()
{
String
bizOrgCodeString
=
getOrgCode
();
// 获取登陆人角色
AgencyUserModel
user
=
getUserInfo
();
List
<
CheckObjectDto
>
menus
=
iOrgUsrService
.
companyListByUser
(
user
);
List
<
CheckObjectDto
>
menus
=
iOrgUsrService
.
companyListByUser
(
user
,
bizOrgCodeString
);
return
ResponseHelper
.
buildResponse
(
menus
);
}
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/OrgUsrServiceImpl.java
View file @
122aec97
...
...
@@ -1455,7 +1455,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
}
@Override
public
List
<
CheckObjectDto
>
companyListByUser
(
AgencyUserModel
user
)
{
public
List
<
CheckObjectDto
>
companyListByUser
(
AgencyUserModel
user
,
String
bizOrgCode
)
{
List
<
CheckObjectDto
>
list
=
new
ArrayList
<>();
// 需要角色为机场单位或管理员,其余角色返回空
String
code
=
UserRolesEnum
.
AIRPORTUNIT
.
getCode
();
...
...
@@ -1487,10 +1487,11 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
}
});
// 返回所在用户单位列表
return
list
.
stream
().
distinct
().
collect
(
Collectors
.
toList
());
List
<
CheckObjectDto
>
lists
=
list
.
stream
().
distinct
().
collect
(
Collectors
.
toList
());
return
lists
.
stream
().
filter
(
i
->
!
i
.
getBizOrgCode
().
equals
(
bizOrgCode
)).
collect
(
Collectors
.
toList
());
}
}
return
list
;
return
list
.
stream
().
filter
(
i
->
!
i
.
getBizOrgCode
().
equals
(
bizOrgCode
)).
collect
(
Collectors
.
toList
())
;
}
/**
...
...
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