|
@@ -2,6 +2,7 @@ package com.ydtech.modules.admin.controller;
|
|
|
|
|
|
|
|
|
|
|
|
|
import cn.dev33.satoken.annotation.SaCheckPermission;
|
|
import cn.dev33.satoken.annotation.SaCheckPermission;
|
|
|
|
|
+import cn.hutool.core.util.StrUtil;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
@@ -20,6 +21,7 @@ import com.ydtech.modules.admin.service.*;
|
|
|
import com.ydtech.modules.admin.model.vo.SysUserBaseVO;
|
|
import com.ydtech.modules.admin.model.vo.SysUserBaseVO;
|
|
|
import com.ydtech.modules.admin.model.vo.SysUser2Vo;
|
|
import com.ydtech.modules.admin.model.vo.SysUser2Vo;
|
|
|
import com.ydtech.modules.base.controller.BaseController;
|
|
import com.ydtech.modules.base.controller.BaseController;
|
|
|
|
|
+import com.ydtech.modules.base.model.dto.BaseDto;
|
|
|
import com.ydtech.modules.base.model.dto.PageDto;
|
|
import com.ydtech.modules.base.model.dto.PageDto;
|
|
|
import com.ydtech.modules.base.model.vo.PageVo;
|
|
import com.ydtech.modules.base.model.vo.PageVo;
|
|
|
import com.ydtech.modules.esm.model.EsmUserReferrer;
|
|
import com.ydtech.modules.esm.model.EsmUserReferrer;
|
|
@@ -456,7 +458,7 @@ public class SysUserController extends BaseController {
|
|
|
@ApiOperation(value = "(new)获取登录用户")
|
|
@ApiOperation(value = "(new)获取登录用户")
|
|
|
@GetMapping(value = "/loginUser")
|
|
@GetMapping(value = "/loginUser")
|
|
|
public HttpResult loginUser() {
|
|
public HttpResult loginUser() {
|
|
|
- SysUser sysUser = getUser();
|
|
|
|
|
|
|
+ SysUser sysUser = sysUserService.getById(getUserId());
|
|
|
SysRole sysRole = sysUserRoleService.gainRoleByUserId(sysUser.getId());
|
|
SysRole sysRole = sysUserRoleService.gainRoleByUserId(sysUser.getId());
|
|
|
if (null != sysRole) {
|
|
if (null != sysRole) {
|
|
|
sysUser.setRoleId(StringUtils.toString(sysRole.getId()));
|
|
sysUser.setRoleId(StringUtils.toString(sysRole.getId()));
|
|
@@ -468,6 +470,10 @@ public class SysUserController extends BaseController {
|
|
|
sysUser.setDeptName(sysDept.getName());
|
|
sysUser.setDeptName(sysDept.getName());
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ EsmUserReferrer eur = esmUserReferrerService.getById(sysUser.getId());
|
|
|
|
|
+ sysUser.setReferrerId(eur.getReferrerId());
|
|
|
|
|
+ sysUser.setReferrerName(eur.getReferrerName());
|
|
|
|
|
+
|
|
|
return HttpResult.ok(sysUser);
|
|
return HttpResult.ok(sysUser);
|
|
|
|
|
|
|
|
}
|
|
}
|
|
@@ -649,12 +655,12 @@ public class SysUserController extends BaseController {
|
|
|
return HttpResult.ok(sysUserService.saveUserInfo(sysUserVo)) ;
|
|
return HttpResult.ok(sysUserService.saveUserInfo(sysUserVo)) ;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+
|
|
|
|
|
+ @ApiOperation(value = "修改用户详情信息")
|
|
|
@PostMapping(value = "/updateUserInfo/{userId}")
|
|
@PostMapping(value = "/updateUserInfo/{userId}")
|
|
|
@ApiImplicitParams({
|
|
@ApiImplicitParams({
|
|
|
@ApiImplicitParam(name = "userId", value = "用户信息", required = true, dataType = "String")
|
|
@ApiImplicitParam(name = "userId", value = "用户信息", required = true, dataType = "String")
|
|
|
})
|
|
})
|
|
|
-
|
|
|
|
|
- @ApiOperation(value = "修改用户详情信息")
|
|
|
|
|
@Transactional
|
|
@Transactional
|
|
|
public HttpResult updateUserInfo(@PathVariable String userId,@RequestBody SysUser2Vo sysUserVo) {
|
|
public HttpResult updateUserInfo(@PathVariable String userId,@RequestBody SysUser2Vo sysUserVo) {
|
|
|
return HttpResult.ok(sysUserService.updateUserInfo(userId,sysUserVo));
|
|
return HttpResult.ok(sysUserService.updateUserInfo(userId,sysUserVo));
|
|
@@ -668,4 +674,18 @@ public class SysUserController extends BaseController {
|
|
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+
|
|
|
|
|
+ @PostMapping(value = "/realNameAuth")
|
|
|
|
|
+ @ApiOperation(value = "实名认证", notes = "" +
|
|
|
|
|
+ "参数1:姓名" +
|
|
|
|
|
+ "</br>参数2:身份证号" )
|
|
|
|
|
+ public HttpResult realNameAuth(@RequestBody BaseDto dto) {
|
|
|
|
|
+ SysUser sysUser = sysUserService.getById(getUserId());
|
|
|
|
|
+ sysUser.setName(dto.getParam1());
|
|
|
|
|
+ sysUser.setIdentity(dto.getParam2());
|
|
|
|
|
+ sysUser.setStatus(1);
|
|
|
|
|
+
|
|
|
|
|
+ return HttpResult.ok(sysUserService.updateById(sysUser));
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
}
|
|
}
|