Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
X
xyqb-user2
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
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
head_group
xyqb-user2
Commits
e14b6393
Commit
e14b6393
authored
Jul 19, 2023
by
唐峰
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
接口参数或请求头无租户参数,默认小咩租户
parent
baf780fc
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
1 deletion
+14
-1
InnerController.java
...tgroup/xyqb/controller/internal/user/InnerController.java
+9
-0
UserCenterController.java
...controller/internal/user/center/UserCenterController.java
+5
-1
No files found.
src/main/java/cn/quantgroup/xyqb/controller/internal/user/InnerController.java
View file @
e14b6393
...
@@ -125,6 +125,9 @@ public class InnerController implements IBaseController {
...
@@ -125,6 +125,9 @@ public class InnerController implements IBaseController {
*/
*/
@RequestMapping
(
"/user/search/phoneNo"
)
@RequestMapping
(
"/user/search/phoneNo"
)
public
JsonResult
findByPhoneNo
(
String
phoneNo
,
Integer
tenantId
)
{
public
JsonResult
findByPhoneNo
(
String
phoneNo
,
Integer
tenantId
)
{
if
(
tenantId
==
null
)
{
tenantId
=
getTenantId
();
}
User
user
=
userService
.
findByPhoneInDb
(
phoneNo
,
tenantId
);
User
user
=
userService
.
findByPhoneInDb
(
phoneNo
,
tenantId
);
if
(
user
==
null
)
{
if
(
user
==
null
)
{
return
JsonResult
.
buildErrorStateResult
(
"查无此人"
,
null
,
4L
);
return
JsonResult
.
buildErrorStateResult
(
"查无此人"
,
null
,
4L
);
...
@@ -347,6 +350,9 @@ public class InnerController implements IBaseController {
...
@@ -347,6 +350,9 @@ public class InnerController implements IBaseController {
*/
*/
@RequestMapping
(
"/user/search/userId"
)
@RequestMapping
(
"/user/search/userId"
)
public
JsonResult
findUserByUserId
(
Long
userId
,
Integer
tenantId
)
{
public
JsonResult
findUserByUserId
(
Long
userId
,
Integer
tenantId
)
{
if
(
tenantId
==
null
)
{
tenantId
=
getTenantId
();
}
User
user
=
userService
.
findById
(
userId
,
tenantId
);
User
user
=
userService
.
findById
(
userId
,
tenantId
);
if
(
user
!=
null
)
{
if
(
user
!=
null
)
{
return
JsonResult
.
buildSuccessResult
(
null
,
new
UserRet
(
user
));
return
JsonResult
.
buildSuccessResult
(
null
,
new
UserRet
(
user
));
...
@@ -361,6 +367,9 @@ public class InnerController implements IBaseController {
...
@@ -361,6 +367,9 @@ public class InnerController implements IBaseController {
@AccessForbiddenValidator
@AccessForbiddenValidator
@RequestMapping
(
"/user_detail/search/phone"
)
@RequestMapping
(
"/user_detail/search/phone"
)
public
JsonResult
findUserDetailByPhone
(
String
phoneNo
,
Integer
tenantId
)
{
public
JsonResult
findUserDetailByPhone
(
String
phoneNo
,
Integer
tenantId
)
{
if
(
tenantId
==
null
)
{
tenantId
=
getTenantId
();
}
UserInfoEntity
userDetail
=
userInfoRepository
.
findByPhoneNoAndTenantId
(
phoneNo
,
tenantId
);
UserInfoEntity
userDetail
=
userInfoRepository
.
findByPhoneNoAndTenantId
(
phoneNo
,
tenantId
);
if
(
userDetail
!=
null
)
{
if
(
userDetail
!=
null
)
{
return
JsonResult
.
buildSuccessResult
(
null
,
UserInfoRet
.
getUserDetail
(
userDetail
));
return
JsonResult
.
buildSuccessResult
(
null
,
UserInfoRet
.
getUserDetail
(
userDetail
));
...
...
src/main/java/cn/quantgroup/xyqb/controller/internal/user/center/UserCenterController.java
View file @
e14b6393
...
@@ -4,6 +4,7 @@ import cn.quantgroup.xyqb.Constants;
...
@@ -4,6 +4,7 @@ import cn.quantgroup.xyqb.Constants;
import
cn.quantgroup.xyqb.aspect.forbidden.AccessForbiddenValidator
;
import
cn.quantgroup.xyqb.aspect.forbidden.AccessForbiddenValidator
;
import
cn.quantgroup.xyqb.aspect.limit.PasswordFreeAccessValidator
;
import
cn.quantgroup.xyqb.aspect.limit.PasswordFreeAccessValidator
;
import
cn.quantgroup.xyqb.constant.UserConstant
;
import
cn.quantgroup.xyqb.constant.UserConstant
;
import
cn.quantgroup.xyqb.controller.IBaseController
;
import
cn.quantgroup.xyqb.entity.User
;
import
cn.quantgroup.xyqb.entity.User
;
import
cn.quantgroup.xyqb.entity.UserInfoEntity
;
import
cn.quantgroup.xyqb.entity.UserInfoEntity
;
import
cn.quantgroup.xyqb.model.JsonResult
;
import
cn.quantgroup.xyqb.model.JsonResult
;
...
@@ -27,7 +28,7 @@ import java.util.Map;
...
@@ -27,7 +28,7 @@ import java.util.Map;
@Slf4j
@Slf4j
@RestController
@RestController
@RequestMapping
(
"/user/center"
)
@RequestMapping
(
"/user/center"
)
public
class
UserCenterController
{
public
class
UserCenterController
implements
IBaseController
{
@Autowired
@Autowired
private
IUserInfoRepository
userInfoRepository
;
private
IUserInfoRepository
userInfoRepository
;
...
@@ -55,6 +56,9 @@ public class UserCenterController {
...
@@ -55,6 +56,9 @@ public class UserCenterController {
@PostMapping
(
"/attach/list"
)
@PostMapping
(
"/attach/list"
)
public
JsonResult
queryUserAttachList
(
@RequestBody
List
<
Long
>
userIds
,
@RequestParam
(
required
=
false
)
Integer
tenantId
)
{
public
JsonResult
queryUserAttachList
(
@RequestBody
List
<
Long
>
userIds
,
@RequestParam
(
required
=
false
)
Integer
tenantId
)
{
//默认羊小咩租户
//默认羊小咩租户
if
(
tenantId
==
null
)
{
tenantId
=
getTenantId
();
}
if
(
CollectionUtils
.
isEmpty
(
userIds
))
{
if
(
CollectionUtils
.
isEmpty
(
userIds
))
{
return
JsonResult
.
buildErrorStateResult
(
"用户 ID 不能为空"
,
null
);
return
JsonResult
.
buildErrorStateResult
(
"用户 ID 不能为空"
,
null
);
}
}
...
...
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