Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
Y
yifu-mvp
Project
Project
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
fangxinjiang
yifu-mvp
Commits
2d10b288
Commit
2d10b288
authored
Mar 11, 2025
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
huych-入离职登记提交
parent
ee9bf1a4
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
10 deletions
+6
-10
UserController.java
...u/cloud/plus/v1/yifu/admin/controller/UserController.java
+2
-2
SysUserService.java
...yifu/cloud/plus/v1/yifu/admin/service/SysUserService.java
+1
-1
SysUserServiceImpl.java
...d/plus/v1/yifu/admin/service/impl/SysUserServiceImpl.java
+3
-7
No files found.
yifu-upms/yifu-upms-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/admin/controller/UserController.java
View file @
2d10b288
...
...
@@ -675,7 +675,7 @@ public class UserController {
**/
@Inner
@PostMapping
(
"/inner/selectInnerCspDeptByUserDeptId"
)
public
R
<
SysCspDeptVo
>
selectInnerCspDeptByUserDeptId
(
@RequestBody
SysCspDeptVo
vo
)
{
public
SysCspDeptVo
selectInnerCspDeptByUserDeptId
(
@RequestBody
SysCspDeptVo
vo
)
{
return
userService
.
selectCspDeptByUserDeptId
(
vo
);
}
...
...
@@ -688,6 +688,6 @@ public class UserController {
**/
@PostMapping
(
"/selectCspDeptByUserDeptId"
)
public
R
<
SysCspDeptVo
>
selectCspDeptByUserDeptId
(
@RequestBody
SysCspDeptVo
vo
)
{
return
userService
.
selectCspDeptByUserDeptId
(
vo
);
return
R
.
ok
(
userService
.
selectCspDeptByUserDeptId
(
vo
)
);
}
}
yifu-upms/yifu-upms-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/admin/service/SysUserService.java
View file @
2d10b288
...
...
@@ -213,5 +213,5 @@ public interface SysUserService extends IService<SysUser> {
R
<
IPage
<
SysUser
>>
cspUserPage
(
Page
page
,
String
deptId
,
String
userName
,
String
nickName
);
R
<
SysCspDeptVo
>
selectCspDeptByUserDeptId
(
SysCspDeptVo
vo
);
SysCspDeptVo
selectCspDeptByUserDeptId
(
SysCspDeptVo
vo
);
}
yifu-upms/yifu-upms-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/admin/service/impl/SysUserServiceImpl.java
View file @
2d10b288
...
...
@@ -47,12 +47,10 @@ import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.MsgUtils
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.RedisUtil
;
import
com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser
;
import
com.yifu.cloud.plus.v1.yifu.common.dapr.util.ArchivesDaprUtil
;
import
com.yifu.cloud.plus.v1.yifu.common.dapr.util.PermissionDaprUtil
;
import
com.yifu.cloud.plus.v1.yifu.common.ldap.entity.PersonVo
;
import
com.yifu.cloud.plus.v1.yifu.common.ldap.util.LdapUtil
;
import
com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils
;
import
lombok.RequiredArgsConstructor
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.beans.BeanUtils
;
...
...
@@ -1015,17 +1013,15 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
}
@Override
public
R
<
SysCspDeptVo
>
selectCspDeptByUserDeptId
(
SysCspDeptVo
vo
)
{
YifuUser
user
=
SecurityUtils
.
getUser
();
public
SysCspDeptVo
selectCspDeptByUserDeptId
(
SysCspDeptVo
vo
)
{
SysCspDeptVo
returnVo
=
userDeptPermissionService
.
selectCasDeptVo
(
vo
.
getUserId
(),
vo
.
getProjectId
());
if
(
Common
.
isNotNull
(
returnVo
)
&&
Common
.
isNotNull
(
returnVo
.
getDepartName
())
&&
Common
.
isNotNull
(
returnVo
.
getDepartId
()))
{
vo
.
setDepartName
(
returnVo
.
getDepartName
());
vo
.
setDepartId
(
returnVo
.
getDepartId
());
}
else
{
vo
.
setDepartName
(
user
.
getDeptName
());
vo
.
setDepartId
(
user
.
getDeptId
());
return
null
;
}
return
R
.
ok
(
vo
)
;
return
vo
;
}
}
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