Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
C
chnmuseum-party
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
liqin
chnmuseum-party
Commits
8ff09f96
Commit
8ff09f96
authored
Jun 26, 2021
by
nie'hong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改-上级单位不需要查看下级单位创建的学习内容
parent
cd0121b3
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
9 deletions
+11
-9
LearningContentController.java
...useum/party/web/controller/LearningContentController.java
+11
-9
No files found.
src/main/java/cn/chnmuseum/party/web/controller/LearningContentController.java
View file @
8ff09f96
...
@@ -304,22 +304,24 @@ public class LearningContentController extends BaseController {
...
@@ -304,22 +304,24 @@ public class LearningContentController extends BaseController {
// 分页查询这里不包括主学习内容
// 分页查询这里不包括主学习内容
queryWrapper
.
eq
(
LearningContent:
:
getIsMajor
,
false
);
queryWrapper
.
eq
(
LearningContent:
:
getIsMajor
,
false
);
// 上级机构
// 上级机构
List
<
String
>
curUserParOrgIds
=
getCurUserParOrgIds
();
//
List<String> curUserParOrgIds = getCurUserParOrgIds();
// 下级机构展板
// 下级机构展板
List
<
String
>
curUserSubOrgIds
=
getCurUserSubOrgIds
();
List
<
String
>
curUserSubOrgIds
=
getCurUserSubOrgIds
();
if
(!
CollectionUtils
.
isEmpty
(
curUserSubOrgIds
)){
if
(!
CollectionUtils
.
isEmpty
(
curUserSubOrgIds
)){
List
<
String
>
list
=
Arrays
.
asList
(
"ALL_PLAT"
);
List
<
String
>
list
=
Arrays
.
asList
(
"ALL_PLAT"
);
queryWrapper
.
and
(
s
->
{
queryWrapper
.
and
(
s
->
{
if
(
CollectionUtil
.
isEmpty
(
curUserParOrgIds
)){
// if (CollectionUtil.isEmpty(curUserParOrgIds)){
s
.
in
(
LearningContent:
:
getOrganCode
,
curUserSubOrgIds
)
// s.in(LearningContent::getOrganCode, curUserSubOrgIds)
.
or
().
in
(
LearningContent:
:
getApplicableScope
,
list
);
// .or().in(LearningContent::getApplicableScope, list);
}
else
{
// }else{
// s.in(LearningContent::getOrganCode, curUserSubOrgIds)
// .or().in(LearningContent::getApplicableScope, list)
// .or(q ->q.in(LearningContent::getOrganCode, curUserParOrgIds)
// .eq(LearningContent::getApplicableScope,"THIS_ORGAN_SUB"));
// }
s
.
in
(
LearningContent:
:
getOrganCode
,
curUserSubOrgIds
)
s
.
in
(
LearningContent:
:
getOrganCode
,
curUserSubOrgIds
)
.
or
().
in
(
LearningContent:
:
getApplicableScope
,
list
)
.
or
().
in
(
LearningContent:
:
getApplicableScope
,
list
);
.
or
(
q
->
q
.
in
(
LearningContent:
:
getOrganCode
,
curUserParOrgIds
)
.
eq
(
LearningContent:
:
getApplicableScope
,
"THIS_ORGAN_SUB"
));
}
});
});
}
}
...
...
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