Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
8
8timerapiv200
Overview
Overview
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
8timerv2
8timerapiv200
Commits
a0bd4a4b
Commit
a0bd4a4b
authored
Jul 01, 2020
by
yuquan.zhu
Committed by
chenzg
Jul 05, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
解决审批问题
parent
b8326a6e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
16 deletions
+20
-16
src/main/java/cn/timer/api/controller/spmk/SpmkController.java
+9
-8
src/main/java/cn/timer/api/utils/router/RouterUtils.java
+11
-8
No files found.
src/main/java/cn/timer/api/controller/spmk/SpmkController.java
View file @
a0bd4a4b
...
...
@@ -535,14 +535,14 @@ public class SpmkController {
Router
router
=
spmkApproveSummaryDto
.
getRouter
();
List
<
Router
>
routers
=
router
.
getChildren
();
if
(
CollectionUtil
.
isNotEmpty
(
routers
))
{
List
<
Relation
>
relations
=
routers
.
get
(
0
).
getRelation
();
if
(
relations
==
null
||
relations
.
size
()
<
1
)
{
return
ResultUtil
.
error
(
"无法发起,请完善审批流程"
);
}
List
<
User
>
users
=
relations
.
get
(
0
).
getUsers
();
if
(
CollectionUtil
.
isEmpty
(
users
))
{
return
ResultUtil
.
error
(
"无法发起,请完善审批流程"
);
}
//
List<Relation> relations = routers.get(0).getRelation();
//
if (relations == null || relations.size() < 1) {
//
return ResultUtil.error("无法发起,请完善审批流程");
//
}
//
List<User> users = relations.get(0).getUsers();
//
if (CollectionUtil.isEmpty(users)) {
//
return ResultUtil.error("无法发起,请完善审批流程");
//
}
}
else
{
return
ResultUtil
.
error
(
"无法发起,请完善审批流程"
);
...
...
@@ -560,6 +560,7 @@ public class SpmkController {
System
.
out
.
println
(
listRouter
);
List
<
FlowChildren
>
listFlowChildren
=
new
ArrayList
<
FlowChildren
>();
RouterUtils
.
getIsFlowChildren
(
listRouter
,
listFlowChildren
);
System
.
out
.
println
(
"listFlowChildren"
);
System
.
out
.
println
(
listFlowChildren
);
// 当前审批人
...
...
src/main/java/cn/timer/api/utils/router/RouterUtils.java
View file @
a0bd4a4b
...
...
@@ -368,15 +368,18 @@ public class RouterUtils {
if
(
listRouter
!=
null
&&
listRouter
.
size
()
==
1
)
{
router
=
listRouter
.
get
(
0
);
Relation
relation
=
CollectionUtil
.
getFirst
(
router
.
getRelation
());
if
(
relation
!=
null
&&
CollectionUtil
.
isNotEmpty
(
relation
.
getUsers
()))
{
if
(
router
.
getFlow
())
{
FlowChildren
fc
=
FlowChildren
.
builder
().
build
();
BeanUtil
.
copyProperties
(
router
,
fc
,
"condition"
,
"children"
);
listFlowChildren
.
add
(
fc
);
getIsFlowChildren
(
router
.
getChildren
(),
listFlowChildren
);
}
for
(
Relation
relation
:
router
.
getRelation
())
{
if
(
relation
!=
null
&&
CollectionUtil
.
isNotEmpty
(
relation
.
getUsers
()))
{
if
(
router
.
getFlow
())
{
FlowChildren
fc
=
FlowChildren
.
builder
().
build
();
BeanUtil
.
copyProperties
(
router
,
fc
,
"condition"
,
"children"
);
listFlowChildren
.
add
(
fc
);
getIsFlowChildren
(
router
.
getChildren
(),
listFlowChildren
);
}
}
}
// Relation relation = CollectionUtil.getFirst(router.getRelation());
}
else
if
(
listRouter
!=
null
&&
listRouter
.
size
()
>
1
)
{
for
(
Router
router2
:
listRouter
)
{
...
...
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