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
e2ac51a1
Commit
e2ac51a1
authored
Jun 20, 2020
by
dengshichuan
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'tzq' into 'develop'
调岗优化 See merge request 8timerv2/8timerapiv200!251
parents
8fecc334
e8acbaa4
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 additions
and
1 deletions
+1
-1
src/main/java/cn/timer/api/utils/router/business/TransferPositionBusiness.java
+1
-1
No files found.
src/main/java/cn/timer/api/utils/router/business/TransferPositionBusiness.java
View file @
e2ac51a1
...
@@ -40,7 +40,7 @@ public class TransferPositionBusiness extends SpmkAssoBusiness {
...
@@ -40,7 +40,7 @@ public class TransferPositionBusiness extends SpmkAssoBusiness {
Integer
TransferInDepartment
=
ObjectUtil
.
isNull
(
jsonObj
.
get
(
"__TransferInDepartment"
,
FromData
.
class
))
?
null
:
Convert
.
toInt
(
jsonObj
.
get
(
"__TransferInDepartment"
,
FromData
.
class
).
getValue
());
Integer
TransferInDepartment
=
ObjectUtil
.
isNull
(
jsonObj
.
get
(
"__TransferInDepartment"
,
FromData
.
class
))
?
null
:
Convert
.
toInt
(
jsonObj
.
get
(
"__TransferInDepartment"
,
FromData
.
class
).
getValue
());
// 调入岗位
// 调入岗位
Integer
TransferInPosition
=
ObjectUtil
.
isNull
(
jsonObj
.
get
(
"__TransferInPosition"
,
FromData
.
class
))
?
null
:
Integer
.
parseInt
(
jsonObj
.
get
(
"__TransferInPosition"
,
FromData
.
class
).
getValue
());
Integer
TransferInPosition
=
ObjectUtil
.
isNull
(
jsonObj
.
get
(
"__TransferInPosition"
,
FromData
.
class
))
?
null
:
Integer
.
parseInt
(
jsonObj
.
get
(
"__TransferInPosition"
,
FromData
.
class
).
getValue
());
if
(
TransferInDepartment
==
null
||
TransferInPosition
==
null
)
{
if
(
TransferInDepartment
==
null
)
{
throw
new
CustomException
(
"部门或岗位 未填写,审批失败"
);
throw
new
CustomException
(
"部门或岗位 未填写,审批失败"
);
}
}
// 生效日期
// 生效日期
...
...
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