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
3bf10e80
Commit
3bf10e80
authored
2 years ago
by
翁国栋
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
草稿箱发布审批流程bug
parent
0fd43ef2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
4 deletions
+7
-4
src/main/java/cn/timer/api/controller/spmk/SpmkController.java
+1
-1
src/main/java/cn/timer/api/utils/router/RouterUtils.java
+6
-3
No files found.
src/main/java/cn/timer/api/controller/spmk/SpmkController.java
View file @
3bf10e80
...
...
@@ -1249,7 +1249,7 @@ public class SpmkController {
.
set
(
"initiator"
,
ygglMainEmp
.
getName
())
.
set
(
"headUrl"
,
ygglMainEmp
.
getHeadUrl
())
.
set
(
"id"
,
userBean
.
getEmpNum
());
RouterUtils
.
NextNode
(
listRouter
,
jSONObject
,
ISFIRST
);
RouterUtils
.
NextNode
(
listRouter
,
jSONObject
,
ISFIRST
,
true
);
List
<
FlowChildren
>
listFlowChildren
=
new
ArrayList
<
FlowChildren
>();
RouterUtils
.
getIsFlowChildren
(
listRouter
,
listFlowChildren
);
...
...
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/utils/router/RouterUtils.java
View file @
3bf10e80
...
...
@@ -91,7 +91,7 @@ public class RouterUtils {
}
// 执行下一个节点
public
static
List
<
Router
>
NextNode
(
List
<
Router
>
listRouter
,
JSONObject
obj
,
boolean
isFirse
,
boolean
isAuditNext
)
throws
NumberFormatException
,
ConvertException
,
Exception
{
public
static
List
<
Router
>
NextNode
(
List
<
Router
>
listRouter
,
JSONObject
obj
,
boolean
isFirse
,
boolean
isAuditNext
,
boolean
...
isDrafts
)
throws
NumberFormatException
,
ConvertException
,
Exception
{
Router
router
;
if
(
CollectionUtil
.
isNotEmpty
(
listRouter
))
{
...
...
@@ -160,9 +160,10 @@ public class RouterUtils {
// }
if
(!
isAuditNext
)
{
//此处如果是草稿就不需要更改
if
(
isDrafts
!=
null
)
{
router
.
setExecute
(
EXECUTING
);
}
if
(
router
.
getRelation
().
size
()
>
0
)
{
// if (r != null && RELATION_TYPE_USERS.equals(r.getType())) {
List
<
User
>
listUser
=
router
.
getRelation
().
get
(
0
).
getUsers
();
...
...
@@ -175,7 +176,9 @@ public class RouterUtils {
}
switch
(
execute
)
{
case
UNEXECUTED:
if
(
isDrafts
!=
null
)
{
listUser
.
get
(
i
).
setExecute
(
EXECUTING
);
}
// 首次发起申请时,写入 审批人名称 至 obj 中
if
(
isFirse
&&
obj
.
getStr
(
"current_approver"
)
==
null
)
{
obj
.
set
(
"current_approver"
,
listUser
.
get
(
i
).
getName
());
...
...
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