Commit cd13983d authored by huyuchen's avatar huyuchen

Merge remote-tracking branch 'origin/MVP1.7.14' into MVP1.7.14

parents 14227558 65707b1d
......@@ -78,7 +78,7 @@ public class UserController {
@GetMapping(value = {"/info"})
public R<UserInfoVO> info() {
String username = SecurityUtils.getUser().getUsername();
SysUser user = userService.getOne(Wrappers.<SysUser>query().lambda().eq(SysUser::getUsername, username));
SysUser user = getNoDeleteSysUser(username);
if (user == null) {
return R.failed(MsgUtils.getMessage(ErrorCodes.SYS_USER_QUERY_ERROR));
}
......@@ -90,6 +90,21 @@ public class UserController {
return R.ok(vo);
}
/**
* @param username 登录名
* @Description: 提取公共发放,获取未删除的用户信息
* @Author: hgw
* @Date: 2025/8/7 11:19
* @return: com.yifu.cloud.plus.v1.yifu.admin.api.entity.SysUser
**/
private SysUser getNoDeleteSysUser(String username) {
if (Common.isNotNull(username)) {
return userService.getOne(Wrappers.<SysUser>query().lambda().eq(SysUser::getUsername, username)
.eq(SysUser::getDelFlag, CommonConstants.STATUS_NORMAL).last(CommonConstants.LAST_ONE_SQL));
}
return null;
}
/**
* 获取指定用户全部信息
*
......@@ -98,7 +113,7 @@ public class UserController {
@Inner
@GetMapping("/info/{username}")
public R<UserInfo> info(@PathVariable String username) {
SysUser user = userService.getOne(Wrappers.<SysUser>query().lambda().eq(SysUser::getUsername, username));
SysUser user = getNoDeleteSysUser(username);
if (user == null) {
return R.failed(MsgUtils.getMessage(ErrorCodes.SYS_USER_USERINFO_EMPTY, username));
}
......@@ -110,7 +125,7 @@ public class UserController {
@GetMapping("/getInfoByUsername")
public UserInfo infoAPI(@RequestParam(required = true, name = "username") String username,
@RequestParam(required = false, name = "password") String password) {
SysUser user = userService.getOne(Wrappers.<SysUser>query().lambda().eq(SysUser::getUsername, username).last(CommonConstants.LAST_ONE_SQL));
SysUser user = getNoDeleteSysUser(username);
if (Common.isNotNull(user)) {
userService.ldapLogin(username, password, user);
}
......@@ -160,9 +175,8 @@ public class UserController {
*/
@GetMapping("/details/{username}")
public R<SysUser> user(@PathVariable String username) {
SysUser condition = new SysUser();
condition.setUsername(username);
return R.ok(userService.getOne(new QueryWrapper<>(condition)));
SysUser user = getNoDeleteSysUser(username);
return R.ok(user);
}
/**
......@@ -464,8 +478,7 @@ public class UserController {
@Inner
@PostMapping(value = {"/inner/getSimpleUserByLoginName"})
public SysUser getSimpleUserByLoginName(@RequestBody String loginName) {
return userService.getOne(Wrappers.<SysUser>query().lambda().eq(SysUser::getUsername,loginName)
.eq(SysUser::getDelFlag,CommonConstants.ZERO_STRING).last(CommonConstants.LAST_ONE_SQL));
return getNoDeleteSysUser(loginName);
}
/**
......@@ -526,8 +539,7 @@ public class UserController {
@Inner
@GetMapping("/inner/getSysUserByUsername")
public SysUser getSysUserByUsername(@RequestParam(name = "username") String username) {
SysUser userInfo = userService.getOne(Wrappers.<SysUser>lambdaQuery().eq(SysUser::getUsername, username)
.eq(SysUser::getDelFlag, CommonConstants.ZERO_STRING).last(CommonConstants.LAST_ONE_SQL));
SysUser userInfo = getNoDeleteSysUser(username);
if (Common.isNotNull(userInfo)){
userInfo.setPassword(null);
return userInfo;
......
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