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
03192419
Commit
03192419
authored
Feb 22, 2024
by
wujiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复全国权限不显示问题
parent
bef1cc12
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
3 deletions
+7
-3
IPermissionServiceImpl.java
...module/jxiop/biz/service/impl/IPermissionServiceImpl.java
+6
-2
McbWarningServiceImpl.java
.../module/jxiop/biz/service/impl/McbWarningServiceImpl.java
+1
-1
No files found.
amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/IPermissionServiceImpl.java
View file @
03192419
...
...
@@ -45,7 +45,9 @@ public class IPermissionServiceImpl implements IPermissionService {
Map
<
String
,
String
>
companyInfo
=
userEmpowerMapper
.
getCompanyInfoByOrgCode
(
permissionOrgCode
);
String
companyLevel
=
companyInfo
.
get
(
"level"
);
if
(
companyLevel
.
equals
(
"categroy_leve2"
))
{
return
stdUserEmpower
.
getAmosOrgCode
();
List
<
StationBasic
>
stationBasics
=
stationBasicMapper
.
selectList
(
new
QueryWrapper
<
StationBasic
>().
like
(
"project_org_code"
,
permissionOrgCode
));
result
=
stationBasics
.
stream
().
map
(
StationBasic:
:
getFanGatewayId
).
collect
(
Collectors
.
toList
());
return
result
;
}
if
(
companyLevel
.
equals
(
"area"
))
{
List
<
StationBasic
>
stationBasics
=
stationBasicMapper
.
selectList
(
new
QueryWrapper
<
StationBasic
>().
like
(
"project_org_code"
,
permissionOrgCode
));
...
...
@@ -74,7 +76,9 @@ public class IPermissionServiceImpl implements IPermissionService {
Map
<
String
,
String
>
companyInfo
=
userEmpowerMapper
.
getCompanyInfoByOrgCode
(
permissionOrgCode
);
String
companyLevel
=
companyInfo
.
get
(
"level"
);
if
(
companyLevel
.
equals
(
"categroy_leve2"
))
{
return
stdUserEmpower
.
getAmosOrgCode
();
List
<
StationBasic
>
stationBasics
=
stationBasicMapper
.
selectList
(
new
QueryWrapper
<
StationBasic
>().
like
(
"project_org_code"
,
permissionOrgCode
));
result
=
stationBasics
.
stream
().
map
(
StationBasic:
:
getFanGatewayId
).
collect
(
Collectors
.
toList
());
return
result
;
}
if
(
companyLevel
.
equals
(
"area"
))
{
List
<
StationBasic
>
stationBasics
=
stationBasicMapper
.
selectList
(
new
QueryWrapper
<
StationBasic
>().
like
(
"project_org_code"
,
permissionOrgCode
));
...
...
amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/McbWarningServiceImpl.java
View file @
03192419
...
...
@@ -183,7 +183,7 @@ public class McbWarningServiceImpl implements IMcbWarningService {
targetList
=
tempList
.
stream
().
filter
(
x
->
{
if
(
CollectionUtil
.
isNotEmpty
(
codes
))
{
for
(
String
str
:
codes
)
{
if
(
x
.
getCode
().
startsWith
(
str
)){
if
(
x
.
getCode
().
equals
(
str
)){
return
true
;
}
}
...
...
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