Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
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
15949247
Commit
15949247
authored
Apr 16, 2021
by
wzp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改bug
parent
08acd05b
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
1 deletion
+4
-1
ExhibitionBoardController.java
...useum/party/web/controller/ExhibitionBoardController.java
+1
-1
TOrganController.java
...ergy/chnmuseum/party/web/controller/TOrganController.java
+3
-0
No files found.
src/main/java/cn/wisenergy/chnmuseum/party/web/controller/ExhibitionBoardController.java
View file @
15949247
...
@@ -203,7 +203,7 @@ public class ExhibitionBoardController extends BaseController {
...
@@ -203,7 +203,7 @@ public class ExhibitionBoardController extends BaseController {
public
Map
<
String
,
Object
>
getExhibitionBoardList
(
public
Map
<
String
,
Object
>
getExhibitionBoardList
(
@RequestParam
(
value
=
"exhibitionBoardCatIdList"
,
required
=
false
)
List
<
String
>
exhibitionBoardCatIdList
,
@RequestParam
(
value
=
"exhibitionBoardCatIdList"
,
required
=
false
)
List
<
String
>
exhibitionBoardCatIdList
,
@RequestParam
(
value
=
"boardCopyrightOwnerIdList"
,
required
=
false
)
List
<
String
>
boardCopyrightOwnerIdList
)
{
@RequestParam
(
value
=
"boardCopyrightOwnerIdList"
,
required
=
false
)
List
<
String
>
boardCopyrightOwnerIdList
)
{
final
LambdaQueryWrapper
<
ExhibitionBoard
>
lambdaQueryWrapper
=
Wrappers
.<
ExhibitionBoard
>
lambdaQuery
().
eq
(
ExhibitionBoard:
:
get
AuditStatus
,
"APPROVED_FINAL"
).
eq
(
ExhibitionBoard:
:
get
Published
,
true
);
final
LambdaQueryWrapper
<
ExhibitionBoard
>
lambdaQueryWrapper
=
Wrappers
.<
ExhibitionBoard
>
lambdaQuery
().
eq
(
ExhibitionBoard:
:
getPublished
,
true
);
if
(
exhibitionBoardCatIdList
!=
null
&&
!
exhibitionBoardCatIdList
.
isEmpty
())
{
if
(
exhibitionBoardCatIdList
!=
null
&&
!
exhibitionBoardCatIdList
.
isEmpty
())
{
lambdaQueryWrapper
.
in
(
ExhibitionBoard:
:
getExhibitionBoardCatId
,
exhibitionBoardCatIdList
);
lambdaQueryWrapper
.
in
(
ExhibitionBoard:
:
getExhibitionBoardCatId
,
exhibitionBoardCatIdList
);
}
}
...
...
src/main/java/cn/wisenergy/chnmuseum/party/web/controller/TOrganController.java
View file @
15949247
...
@@ -56,6 +56,9 @@ public class TOrganController extends BaseController {
...
@@ -56,6 +56,9 @@ public class TOrganController extends BaseController {
public
Map
<
String
,
Object
>
add
(
TOrgan
organ
)
{
public
Map
<
String
,
Object
>
add
(
TOrgan
organ
)
{
HashMap
<
String
,
Object
>
resultMap
=
new
HashMap
<>();
HashMap
<
String
,
Object
>
resultMap
=
new
HashMap
<>();
QueryWrapper
<
TOrgan
>
ew
=
new
QueryWrapper
<>();
QueryWrapper
<
TOrgan
>
ew
=
new
QueryWrapper
<>();
if
(
StringUtils
.
isBlank
(
organ
.
getParentId
())){
organ
.
setParentId
(
"0"
);
}
if
(
StringUtils
.
isNoneBlank
(
organ
.
getName
().
trim
()))
{
if
(
StringUtils
.
isNoneBlank
(
organ
.
getName
().
trim
()))
{
organ
.
setName
(
organ
.
getName
().
trim
());
organ
.
setName
(
organ
.
getName
().
trim
());
ew
.
eq
(
"is_deleted"
,
0
);
ew
.
eq
(
"is_deleted"
,
0
);
...
...
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