Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
smart_gov_platform
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
赵啸非
smart_gov_platform
Commits
b8f3031f
Commit
b8f3031f
authored
Feb 17, 2025
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改部分一键部署功能
parent
186d35b7
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
6 deletions
+6
-6
base-manager/src/main/java/com/mortals/xhx/module/site/service/impl/SiteBusinessServiceImpl.java
...xhx/module/site/service/impl/SiteBusinessServiceImpl.java
+6
-6
No files found.
base-manager/src/main/java/com/mortals/xhx/module/site/service/impl/SiteBusinessServiceImpl.java
View file @
b8f3031f
...
@@ -56,11 +56,11 @@ public class SiteBusinessServiceImpl extends AbstractCRUDCacheServiceImpl<SiteBu
...
@@ -56,11 +56,11 @@ public class SiteBusinessServiceImpl extends AbstractCRUDCacheServiceImpl<SiteBu
*/
*/
@Override
@Override
protected
SiteBusinessEntity
findBefore
(
SiteBusinessEntity
params
,
PageInfo
pageInfo
,
Context
context
)
throws
AppException
{
protected
SiteBusinessEntity
findBefore
(
SiteBusinessEntity
params
,
PageInfo
pageInfo
,
Context
context
)
throws
AppException
{
if
(!
ObjectUtils
.
isEmpty
(
params
.
getIdNotList
()))
{
if
(!
ObjectUtils
.
isEmpty
(
params
.
get
Business
IdNotList
()))
{
Set
<
Long
>
notIdSet
=
params
.
getIdNotList
().
stream
().
collect
(
Collectors
.
toSet
());
Set
<
Long
>
notIdSet
=
params
.
get
Business
IdNotList
().
stream
().
collect
(
Collectors
.
toSet
());
//排除掉了父级,但是子集存在,需要吧父id排除到notlist外
//排除掉了父级,但是子集存在,需要吧父id排除到notlist外
SiteBusinessQuery
siteBusinessQuery
=
new
SiteBusinessQuery
();
SiteBusinessQuery
siteBusinessQuery
=
new
SiteBusinessQuery
();
siteBusinessQuery
.
set
IdList
(
params
.
get
IdNotList
());
siteBusinessQuery
.
set
BusinessIdNotList
(
params
.
getBusiness
IdNotList
());
List
<
SiteBusinessEntity
>
rootSiteBusiness
=
this
.
find
(
siteBusinessQuery
).
stream
().
filter
(
f
->
f
.
getIsBusiness
()
==
IsBusinessEnum
.
一级业务
.
getValue
()).
collect
(
Collectors
.
toList
());
List
<
SiteBusinessEntity
>
rootSiteBusiness
=
this
.
find
(
siteBusinessQuery
).
stream
().
filter
(
f
->
f
.
getIsBusiness
()
==
IsBusinessEnum
.
一级业务
.
getValue
()).
collect
(
Collectors
.
toList
());
for
(
SiteBusinessEntity
root
:
rootSiteBusiness
)
{
for
(
SiteBusinessEntity
root
:
rootSiteBusiness
)
{
SiteBusinessQuery
query
=
new
SiteBusinessQuery
();
SiteBusinessQuery
query
=
new
SiteBusinessQuery
();
...
@@ -79,7 +79,7 @@ public class SiteBusinessServiceImpl extends AbstractCRUDCacheServiceImpl<SiteBu
...
@@ -79,7 +79,7 @@ public class SiteBusinessServiceImpl extends AbstractCRUDCacheServiceImpl<SiteBu
notIdSet
.
remove
(
root
.
getId
());
notIdSet
.
remove
(
root
.
getId
());
}
}
}
}
params
.
setIdNotList
(
notIdSet
.
stream
().
collect
(
Collectors
.
toList
()));
params
.
set
Business
IdNotList
(
notIdSet
.
stream
().
collect
(
Collectors
.
toList
()));
}
}
...
@@ -88,7 +88,7 @@ public class SiteBusinessServiceImpl extends AbstractCRUDCacheServiceImpl<SiteBu
...
@@ -88,7 +88,7 @@ public class SiteBusinessServiceImpl extends AbstractCRUDCacheServiceImpl<SiteBu
@Override
@Override
protected
void
findAfter
(
SiteBusinessEntity
params
,
PageInfo
pageInfo
,
Context
context
,
List
<
SiteBusinessEntity
>
list
)
throws
AppException
{
protected
void
findAfter
(
SiteBusinessEntity
params
,
PageInfo
pageInfo
,
Context
context
,
List
<
SiteBusinessEntity
>
list
)
throws
AppException
{
if
(!
ObjectUtils
.
isEmpty
(
params
.
getIdNotList
()))
{
if
(!
ObjectUtils
.
isEmpty
(
params
.
get
Business
IdNotList
()))
{
//排除掉已经存在的ids
//排除掉已经存在的ids
log
.
info
(
"idNotList:{}"
,
JSON
.
toJSONString
(
params
.
getIdNotList
()));
log
.
info
(
"idNotList:{}"
,
JSON
.
toJSONString
(
params
.
getIdNotList
()));
Iterator
<
SiteBusinessEntity
>
iterator
=
list
.
iterator
();
Iterator
<
SiteBusinessEntity
>
iterator
=
list
.
iterator
();
...
@@ -99,7 +99,7 @@ public class SiteBusinessServiceImpl extends AbstractCRUDCacheServiceImpl<SiteBu
...
@@ -99,7 +99,7 @@ public class SiteBusinessServiceImpl extends AbstractCRUDCacheServiceImpl<SiteBu
siteBusinessQuery
.
setParentId
(
item
.
getBusinessId
());
siteBusinessQuery
.
setParentId
(
item
.
getBusinessId
());
int
count
=
this
.
count
(
siteBusinessQuery
,
context
);
int
count
=
this
.
count
(
siteBusinessQuery
,
context
);
if
(
count
>
0
)
{
if
(
count
>
0
)
{
siteBusinessQuery
.
set
IdNotList
(
params
.
get
IdNotList
());
siteBusinessQuery
.
set
BusinessIdNotList
(
params
.
getBusiness
IdNotList
());
List
<
SiteBusinessEntity
>
childs
=
this
.
find
(
siteBusinessQuery
);
List
<
SiteBusinessEntity
>
childs
=
this
.
find
(
siteBusinessQuery
);
if
(
ObjectUtils
.
isEmpty
(
childs
))
{
if
(
ObjectUtils
.
isEmpty
(
childs
))
{
//子节点已经全部选中,删除父节点
//子节点已经全部选中,删除父节点
...
...
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