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
7bde5881
Commit
7bde5881
authored
Jun 02, 2021
by
nie'hong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修补bug,删除展板后的处理
parent
7d01fdaf
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
3 deletions
+5
-3
PinYinUtil.java
src/main/java/cn/chnmuseum/party/common/util/PinYinUtil.java
+1
-0
AuditServiceImpl.java
...ava/cn/chnmuseum/party/service/impl/AuditServiceImpl.java
+3
-1
LearningContentController.java
...useum/party/web/controller/LearningContentController.java
+1
-2
No files found.
src/main/java/cn/chnmuseum/party/common/util/PinYinUtil.java
View file @
7bde5881
...
@@ -83,6 +83,7 @@ public class PinYinUtil {
...
@@ -83,6 +83,7 @@ public class PinYinUtil {
String
withSepNoMark
=
pinyin
.
translateWithSepNoMark
(
chinese
,
""
);
String
withSepNoMark
=
pinyin
.
translateWithSepNoMark
(
chinese
,
""
);
// 将字符串中的'ü'替换为'v’
// 将字符串中的'ü'替换为'v’
pinyinString
=
withSepNoMark
.
replace
(
"ü"
,
"v"
);
pinyinString
=
withSepNoMark
.
replace
(
"ü"
,
"v"
);
pinyinString
=
pinyinString
.
replace
(
","
,
""
);
}
}
}
catch
(
PinyinException
e
)
{
}
catch
(
PinyinException
e
)
{
e
.
printStackTrace
();
e
.
printStackTrace
();
...
...
src/main/java/cn/chnmuseum/party/service/impl/AuditServiceImpl.java
View file @
7bde5881
...
@@ -365,7 +365,9 @@ public class AuditServiceImpl extends ServiceImpl<AuditMapper, Audit> implements
...
@@ -365,7 +365,9 @@ public class AuditServiceImpl extends ServiceImpl<AuditMapper, Audit> implements
update
=
this
.
exhibitionBoardService
.
updateById
(
exhibitionBoard
);
update
=
this
.
exhibitionBoardService
.
updateById
(
exhibitionBoard
);
break
;
break
;
case
REMOVE:
case
REMOVE:
final
LambdaQueryWrapper
<
LearningContentBoard
>
learningContentBoardLambdaQueryWrapper
=
Wrappers
.<
LearningContentBoard
>
lambdaQuery
().
eq
(
LearningContentBoard:
:
getExhibitionBoardCatId
,
exhibitionBoardId
);
// 6.2改 getExhibitionBoardCatId改为getExhibitionBoardId
// final LambdaQueryWrapper<LearningContentBoard> learningContentBoardLambdaQueryWrapper = Wrappers.<LearningContentBoard>lambdaQuery().eq(LearningContentBoard::getExhibitionBoardCatId, exhibitionBoardId);
final
LambdaQueryWrapper
<
LearningContentBoard
>
learningContentBoardLambdaQueryWrapper
=
Wrappers
.<
LearningContentBoard
>
lambdaQuery
().
eq
(
LearningContentBoard:
:
getExhibitionBoardId
,
exhibitionBoardId
);
final
List
<
LearningContentBoard
>
learningContentBoardList
=
this
.
learningContentBoardService
.
list
(
learningContentBoardLambdaQueryWrapper
);
final
List
<
LearningContentBoard
>
learningContentBoardList
=
this
.
learningContentBoardService
.
list
(
learningContentBoardLambdaQueryWrapper
);
if
(
learningContentBoardList
!=
null
&&
!
learningContentBoardList
.
isEmpty
())
{
if
(
learningContentBoardList
!=
null
&&
!
learningContentBoardList
.
isEmpty
())
{
final
Map
<
String
,
List
<
String
>>
collect
=
learningContentBoardList
.
stream
().
collect
(
Collectors
.
groupingBy
(
LearningContentBoard:
:
getLearningContentId
,
Collectors
.
mapping
(
LearningContentBoard:
:
getExhibitionBoardId
,
Collectors
.
toList
())));
final
Map
<
String
,
List
<
String
>>
collect
=
learningContentBoardList
.
stream
().
collect
(
Collectors
.
groupingBy
(
LearningContentBoard:
:
getLearningContentId
,
Collectors
.
mapping
(
LearningContentBoard:
:
getExhibitionBoardId
,
Collectors
.
toList
())));
...
...
src/main/java/cn/chnmuseum/party/web/controller/LearningContentController.java
View file @
7bde5881
...
@@ -322,8 +322,7 @@ public class LearningContentController extends BaseController {
...
@@ -322,8 +322,7 @@ public class LearningContentController extends BaseController {
// List<CopyrightOwner> copyrightOwnerList = this.copyrightOwnerService.listByIds(copyrightOwnerIdList);
// List<CopyrightOwner> copyrightOwnerList = this.copyrightOwnerService.listByIds(copyrightOwnerIdList);
// String copyrightOwnerNames = copyrightOwnerList.stream().map(CopyrightOwner::getName).collect(Collectors.joining("、"));
// String copyrightOwnerNames = copyrightOwnerList.stream().map(CopyrightOwner::getName).collect(Collectors.joining("、"));
// learningContent.setCopyrightOwnerNames(copyrightOwnerNames);
// learningContent.setCopyrightOwnerNames(copyrightOwnerNames);
// learningContent.setExhibitionBoardCount(exhibitionBoardCount);
learningContent
.
setExhibitionBoardCount
(
exhibitionBoardCount
);
}
}
return
getResult
(
page
);
return
getResult
(
page
);
}
}
...
...
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