Skip to content
Toggle navigation
Toggle navigation
This project
Loading...
Sign in
legobackend
/
lego-manage
Go to a project
Toggle navigation
Toggle navigation pinning
Projects
Groups
Snippets
Help
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Issue Boards
Files
Commits
Network
Compare
Branches
Tags
63219de6
authored
2024-11-10 10:14:03 +0800
by
chentao
Browse Files
Options
Browse Files
Tag
Download
Email Patches
Plain Diff
no message
1 parent
56d19600
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
8 deletions
lego-core/src/main/java/com/lego/core/service/impl/BuildingBlockServiceImpl.java
lego-core/src/main/java/com/lego/core/service/impl/EntiretyServiceImpl.java
lego-core/src/main/java/com/lego/core/service/impl/BuildingBlockServiceImpl.java
View file @
63219de
...
...
@@ -20,6 +20,7 @@ import com.lego.core.service.IBuildingBlockService;
import
com.lego.core.service.IEntiretyService
;
import
io.micrometer.core.instrument.util.StringUtils
;
import
lombok.RequiredArgsConstructor
;
import
org.apache.commons.compress.utils.Lists
;
import
org.springframework.stereotype.Service
;
import
org.springframework.util.CollectionUtils
;
...
...
@@ -93,18 +94,15 @@ public class BuildingBlockServiceImpl implements IBuildingBlockService {
*/
@Override
public
List
<
BuildingBlockVo
>
list
(
String
language
,
Collection
<
String
>
entiretyIds
)
{
if
(
StringUtils
.
isBlank
(
language
))
language
=
"zh_CN"
;
List
<
BuildingBlockVo
>
list
=
Lists
.
newArrayList
();
if
(!
CollectionUtils
.
isEmpty
(
entiretyIds
))
{
List
<
BuildingBlockVo
>
list
=
baseMapper
.
selectVoList
(
Wrappers
.<
BuildingBlock
>
lambdaQuery
().
eq
(
BuildingBlock:
:
getLanguage
,
language
).
in
(
BuildingBlock:
:
getEntiretyId
,
entiretyIds
));
setInfo
(
list
);
return
list
;
list
=
baseMapper
.
selectVoList
(
Wrappers
.<
BuildingBlock
>
lambdaQuery
().
eq
(
BuildingBlock:
:
getLanguage
,
language
).
in
(
BuildingBlock:
:
getEntiretyId
,
entiretyIds
));
}
else
{
List
<
BuildingBlockVo
>
list
=
baseMapper
.
selectVoList
(
Wrappers
.<
BuildingBlock
>
lambdaQuery
().
eq
(
BuildingBlock:
:
getLanguage
,
language
));
setInfo
(
list
);
return
list
;
list
=
baseMapper
.
selectVoList
(
Wrappers
.<
BuildingBlock
>
lambdaQuery
().
eq
(
BuildingBlock:
:
getLanguage
,
language
));
}
setInfo
(
list
);
return
list
;
}
/**
...
...
lego-core/src/main/java/com/lego/core/service/impl/EntiretyServiceImpl.java
View file @
63219de
...
...
@@ -21,6 +21,7 @@ import com.lego.core.mapper.BuildingBlockMapper;
import
com.lego.core.mapper.EntiretyMapper
;
import
com.lego.core.service.IBuildingBlockService
;
import
com.lego.core.service.IEntiretyService
;
import
io.micrometer.core.instrument.util.StringUtils
;
import
lombok.RequiredArgsConstructor
;
import
org.springframework.stereotype.Service
;
...
...
@@ -52,6 +53,8 @@ public class EntiretyServiceImpl implements IEntiretyService {
*/
@Override
public
TableDataInfo
<
EntiretyVo
>
listPage
(
PageQuery
query
,
String
language
)
{
if
(
StringUtils
.
isBlank
(
language
))
language
=
"zh_CN"
;
Page
<
EntiretyVo
>
page
=
baseMapper
.
selectVoPage
(
query
.
build
(),
Wrappers
.<
Entirety
>
lambdaQuery
()
.
eq
(
Entirety:
:
getLanguage
,
language
).
orderByAsc
(
Entirety:
:
getSort
));
/**
...
...
Write
Preview
Styling with
Markdown
is supported
Attach a file
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 post a comment