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
f792cf8d
Commit
f792cf8d
authored
Sep 01, 2023
by
翁国栋
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
审批移除人员bug
parent
19cebcff
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
1 deletions
+10
-1
src/main/java/cn/timer/api/controller/spmk/SpmkController.java
+7
-1
src/main/java/cn/timer/api/dto/spmk/SpmkApproveDetailDto.java
+3
-0
No files found.
src/main/java/cn/timer/api/controller/spmk/SpmkController.java
View file @
f792cf8d
...
...
@@ -1484,7 +1484,13 @@ public class SpmkController {
isFinal
=
true
;
}
//执行中的人会存在操作记录
SpmkApproveExecuteRecord
spmkApproveExecuteRecord
=
spmkApproveExecuteRecordMapper
.
selectExecuteRecordById
(
Integer
.
parseInt
(
currentUser
.
getId
()),
spmkApproveDetailSummary
.
getApproveSummaryId
());
SpmkApproveExecuteRecord
spmkApproveExecuteRecord
;
//执行中的人会存在操作记录/spmk/delteApprove
if
(
spmkApproveDetailDto
.
getApproveExecuteRecordId
()!=
null
)
{
spmkApproveExecuteRecord
=
SpmkApproveExecuteRecord
.
builder
().
id
(
spmkApproveDetailDto
.
getApproveExecuteRecordId
()).
build
().
selectById
();
}
else
{
spmkApproveExecuteRecord
=
spmkApproveExecuteRecordMapper
.
selectExecuteRecordById
(
Integer
.
parseInt
(
currentUser
.
getId
()),
spmkApproveDetailSummary
.
getApproveSummaryId
());
}
//删除操作人记录
if
(
spmkApproveExecuteRecord
!=
null
)
{
SpmkExecutor
spmkExecutor
=
SpmkExecutor
.
builder
().
build
().
selectOne
(
new
LambdaQueryWrapper
<
SpmkExecutor
>()
...
...
src/main/java/cn/timer/api/dto/spmk/SpmkApproveDetailDto.java
View file @
f792cf8d
...
...
@@ -65,4 +65,7 @@ public class SpmkApproveDetailDto {
private
Integer
userIndex
;
//插入审批人的当前用户索引
private
Integer
approveExecuteId
;
private
Integer
approveExecuteRecordId
;
}
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