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
7aa4f1b5
Commit
7aa4f1b5
authored
4 years ago
by
yuquan.zhu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
解决审批问题
parent
7bcd3675
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
9 deletions
+13
-9
src/main/java/cn/timer/api/controller/spmk/SpmkController.java
+9
-8
src/main/java/cn/timer/api/utils/router/RouterUtils.java
+4
-1
No files found.
src/main/java/cn/timer/api/controller/spmk/SpmkController.java
View file @
7aa4f1b5
...
@@ -535,14 +535,14 @@ public class SpmkController {
...
@@ -535,14 +535,14 @@ public class SpmkController {
Router
router
=
spmkApproveSummaryDto
.
getRouter
();
Router
router
=
spmkApproveSummaryDto
.
getRouter
();
List
<
Router
>
routers
=
router
.
getChildren
();
List
<
Router
>
routers
=
router
.
getChildren
();
if
(
CollectionUtil
.
isNotEmpty
(
routers
))
{
if
(
CollectionUtil
.
isNotEmpty
(
routers
))
{
List
<
Relation
>
relations
=
routers
.
get
(
0
).
getRelation
();
//
List<Relation> relations = routers.get(0).getRelation();
if
(
relations
==
null
||
relations
.
size
()
<
1
)
{
//
if (relations == null || relations.size() < 1) {
return
ResultUtil
.
error
(
"无法发起,请完善审批流程"
);
//
return ResultUtil.error("无法发起,请完善审批流程");
}
//
}
List
<
User
>
users
=
relations
.
get
(
0
).
getUsers
();
//
List<User> users = relations.get(0).getUsers();
if
(
CollectionUtil
.
isEmpty
(
users
))
{
//
if (CollectionUtil.isEmpty(users)) {
return
ResultUtil
.
error
(
"无法发起,请完善审批流程"
);
//
return ResultUtil.error("无法发起,请完善审批流程");
}
//
}
}
else
{
}
else
{
return
ResultUtil
.
error
(
"无法发起,请完善审批流程"
);
return
ResultUtil
.
error
(
"无法发起,请完善审批流程"
);
...
@@ -560,6 +560,7 @@ public class SpmkController {
...
@@ -560,6 +560,7 @@ public class SpmkController {
System
.
out
.
println
(
listRouter
);
System
.
out
.
println
(
listRouter
);
List
<
FlowChildren
>
listFlowChildren
=
new
ArrayList
<
FlowChildren
>();
List
<
FlowChildren
>
listFlowChildren
=
new
ArrayList
<
FlowChildren
>();
RouterUtils
.
getIsFlowChildren
(
listRouter
,
listFlowChildren
);
RouterUtils
.
getIsFlowChildren
(
listRouter
,
listFlowChildren
);
System
.
out
.
println
(
"listFlowChildren"
);
System
.
out
.
println
(
listFlowChildren
);
System
.
out
.
println
(
listFlowChildren
);
// 当前审批人
// 当前审批人
...
...
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/utils/router/RouterUtils.java
View file @
7aa4f1b5
...
@@ -368,7 +368,7 @@ public class RouterUtils {
...
@@ -368,7 +368,7 @@ public class RouterUtils {
if
(
listRouter
!=
null
&&
listRouter
.
size
()
==
1
)
{
if
(
listRouter
!=
null
&&
listRouter
.
size
()
==
1
)
{
router
=
listRouter
.
get
(
0
);
router
=
listRouter
.
get
(
0
);
Relation
relation
=
CollectionUtil
.
getFirst
(
router
.
getRelation
());
for
(
Relation
relation
:
router
.
getRelation
())
{
if
(
relation
!=
null
&&
CollectionUtil
.
isNotEmpty
(
relation
.
getUsers
()))
{
if
(
relation
!=
null
&&
CollectionUtil
.
isNotEmpty
(
relation
.
getUsers
()))
{
if
(
router
.
getFlow
())
{
if
(
router
.
getFlow
())
{
FlowChildren
fc
=
FlowChildren
.
builder
().
build
();
FlowChildren
fc
=
FlowChildren
.
builder
().
build
();
...
@@ -377,6 +377,9 @@ public class RouterUtils {
...
@@ -377,6 +377,9 @@ public class RouterUtils {
getIsFlowChildren
(
router
.
getChildren
(),
listFlowChildren
);
getIsFlowChildren
(
router
.
getChildren
(),
listFlowChildren
);
}
}
}
}
}
// Relation relation = CollectionUtil.getFirst(router.getRelation());
}
else
if
(
listRouter
!=
null
&&
listRouter
.
size
()
>
1
)
{
}
else
if
(
listRouter
!=
null
&&
listRouter
.
size
()
>
1
)
{
for
(
Router
router2
:
listRouter
)
{
for
(
Router
router2
:
listRouter
)
{
...
...
This diff is collapsed.
Click to expand it.
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