Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
cloud-platform
Project
Project
Details
Activity
Releases
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
youjj
cloud-platform
Commits
6ab6cc5c
Commit
6ab6cc5c
authored
Dec 18, 2019
by
zuoyh
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
员工信息修改_复职修改
parent
bb6e2287
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
AppUserPositionTempBiz.java
...ub/wxiaoqi/security/admin/biz/AppUserPositionTempBiz.java
+1
-1
AppUserPositionController.java
.../security/admin/rest/admin/AppUserPositionController.java
+1
-1
No files found.
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserPositionTempBiz.java
View file @
6ab6cc5c
...
...
@@ -167,7 +167,7 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
String
jobName
=
jobMap
==
null
?
""
:
jobMap
.
get
(
appUserPositionTemp
.
getJobId
())
==
null
?
""
:
jobMap
.
get
(
appUserPositionTemp
.
getJobId
()).
getName
();
appUserPositionTempVo
.
setPositionName
(
postionName
);
appUserPositionTempVo
.
setJobName
(
jobName
);
appUserPositionTempVo
.
setI
d
Quit
(
appUserPositionTemp
.
getIsQuit
());
appUserPositionTempVo
.
setI
s
Quit
(
appUserPositionTemp
.
getIsQuit
());
appUserPositionTempVo
.
setStatus
(
appUserPositionTemp
.
getUserId
()
==
null
?
DataStatus
.
NO_USERED
.
code
:
appUserPositionTemp
.
getUserId
()
==
0
?
DataStatus
.
NO_USERED
.
code
:
DataStatus
.
USERED
.
code
);
appUserPositionTempVos
.
add
(
appUserPositionTempVo
);
}
...
...
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/admin/AppUserPositionController.java
View file @
6ab6cc5c
...
...
@@ -134,7 +134,7 @@ public class AppUserPositionController {
/**
* 员工复职位
*/
@
Ge
tMapping
(
"/updAddPositionChangeRecord"
)
@
Pos
tMapping
(
"/updAddPositionChangeRecord"
)
public
ObjectRestResponse
updAddPositionChangeRecord
(
@RequestBody
AppUserPositionTempDTO
appUserPositionTempDTO
,
HttpServletRequest
request
)
{
try
{
IJWTInfo
infoFromToken
=
userAuthUtil
.
getInfoFromToken
(
userAuthConfig
.
getToken
(
request
));
...
...
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