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
93cbc696
Commit
93cbc696
authored
Aug 07, 2025
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.7.14-优化登录获取信息getOne报错
parent
744ee557
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
22 additions
and
10 deletions
+22
-10
UserController.java
...u/cloud/plus/v1/yifu/admin/controller/UserController.java
+22
-10
No files found.
yifu-upms/yifu-upms-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/admin/controller/UserController.java
View file @
93cbc696
...
@@ -78,7 +78,7 @@ public class UserController {
...
@@ -78,7 +78,7 @@ public class UserController {
@GetMapping
(
value
=
{
"/info"
})
@GetMapping
(
value
=
{
"/info"
})
public
R
<
UserInfoVO
>
info
()
{
public
R
<
UserInfoVO
>
info
()
{
String
username
=
SecurityUtils
.
getUser
().
getUsername
();
String
username
=
SecurityUtils
.
getUser
().
getUsername
();
SysUser
user
=
userService
.
getOne
(
Wrappers
.<
SysUser
>
query
().
lambda
().
eq
(
SysUser:
:
getUsername
,
username
)
);
SysUser
user
=
getNoDeleteSysUser
(
username
);
if
(
user
==
null
)
{
if
(
user
==
null
)
{
return
R
.
failed
(
MsgUtils
.
getMessage
(
ErrorCodes
.
SYS_USER_QUERY_ERROR
));
return
R
.
failed
(
MsgUtils
.
getMessage
(
ErrorCodes
.
SYS_USER_QUERY_ERROR
));
}
}
...
@@ -90,6 +90,21 @@ public class UserController {
...
@@ -90,6 +90,21 @@ public class UserController {
return
R
.
ok
(
vo
);
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 {
...
@@ -98,7 +113,7 @@ public class UserController {
@Inner
@Inner
@GetMapping
(
"/info/{username}"
)
@GetMapping
(
"/info/{username}"
)
public
R
<
UserInfo
>
info
(
@PathVariable
String
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
)
{
if
(
user
==
null
)
{
return
R
.
failed
(
MsgUtils
.
getMessage
(
ErrorCodes
.
SYS_USER_USERINFO_EMPTY
,
username
));
return
R
.
failed
(
MsgUtils
.
getMessage
(
ErrorCodes
.
SYS_USER_USERINFO_EMPTY
,
username
));
}
}
...
@@ -110,7 +125,7 @@ public class UserController {
...
@@ -110,7 +125,7 @@ public class UserController {
@GetMapping
(
"/getInfoByUsername"
)
@GetMapping
(
"/getInfoByUsername"
)
public
UserInfo
infoAPI
(
@RequestParam
(
required
=
true
,
name
=
"username"
)
String
username
,
public
UserInfo
infoAPI
(
@RequestParam
(
required
=
true
,
name
=
"username"
)
String
username
,
@RequestParam
(
required
=
false
,
name
=
"password"
)
String
password
)
{
@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
))
{
if
(
Common
.
isNotNull
(
user
))
{
userService
.
ldapLogin
(
username
,
password
,
user
);
userService
.
ldapLogin
(
username
,
password
,
user
);
}
}
...
@@ -160,9 +175,8 @@ public class UserController {
...
@@ -160,9 +175,8 @@ public class UserController {
*/
*/
@GetMapping
(
"/details/{username}"
)
@GetMapping
(
"/details/{username}"
)
public
R
<
SysUser
>
user
(
@PathVariable
String
username
)
{
public
R
<
SysUser
>
user
(
@PathVariable
String
username
)
{
SysUser
condition
=
new
SysUser
();
SysUser
user
=
getNoDeleteSysUser
(
username
);
condition
.
setUsername
(
username
);
return
R
.
ok
(
user
);
return
R
.
ok
(
userService
.
getOne
(
new
QueryWrapper
<>(
condition
)));
}
}
/**
/**
...
@@ -464,8 +478,7 @@ public class UserController {
...
@@ -464,8 +478,7 @@ public class UserController {
@Inner
@Inner
@PostMapping
(
value
=
{
"/inner/getSimpleUserByLoginName"
})
@PostMapping
(
value
=
{
"/inner/getSimpleUserByLoginName"
})
public
SysUser
getSimpleUserByLoginName
(
@RequestBody
String
loginName
)
{
public
SysUser
getSimpleUserByLoginName
(
@RequestBody
String
loginName
)
{
return
userService
.
getOne
(
Wrappers
.<
SysUser
>
query
().
lambda
().
eq
(
SysUser:
:
getUsername
,
loginName
)
return
getNoDeleteSysUser
(
loginName
);
.
eq
(
SysUser:
:
getDelFlag
,
CommonConstants
.
ZERO_STRING
).
last
(
CommonConstants
.
LAST_ONE_SQL
));
}
}
/**
/**
...
@@ -526,8 +539,7 @@ public class UserController {
...
@@ -526,8 +539,7 @@ public class UserController {
@Inner
@Inner
@GetMapping
(
"/inner/getSysUserByUsername"
)
@GetMapping
(
"/inner/getSysUserByUsername"
)
public
SysUser
getSysUserByUsername
(
@RequestParam
(
name
=
"username"
)
String
username
)
{
public
SysUser
getSysUserByUsername
(
@RequestParam
(
name
=
"username"
)
String
username
)
{
SysUser
userInfo
=
userService
.
getOne
(
Wrappers
.<
SysUser
>
lambdaQuery
().
eq
(
SysUser:
:
getUsername
,
username
)
SysUser
userInfo
=
getNoDeleteSysUser
(
username
);
.
eq
(
SysUser:
:
getDelFlag
,
CommonConstants
.
ZERO_STRING
).
last
(
CommonConstants
.
LAST_ONE_SQL
));
if
(
Common
.
isNotNull
(
userInfo
)){
if
(
Common
.
isNotNull
(
userInfo
)){
userInfo
.
setPassword
(
null
);
userInfo
.
setPassword
(
null
);
return
userInfo
;
return
userInfo
;
...
...
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