Commit 2d10b288 authored by huyuchen's avatar huyuchen

huych-入离职登记提交

parent ee9bf1a4
......@@ -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));
}
}
......@@ -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);
}
......@@ -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;
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment