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
de9e5a73
Commit
de9e5a73
authored
Nov 16, 2021
by
gaoguangjing
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'KA-29' of
http://git.quantgroup.cn/head_group/xyqb-user2
into KA-29
parents
4e431c32
2244a2e7
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
6 deletions
+6
-6
InnerController.java
...tgroup/xyqb/controller/internal/user/InnerController.java
+6
-6
No files found.
src/main/java/cn/quantgroup/xyqb/controller/internal/user/InnerController.java
View file @
de9e5a73
...
...
@@ -136,13 +136,13 @@ public class InnerController implements IBaseController {
public
JsonResult
findByPhoneNo
(
String
phoneNo
,
Integer
tenantId
)
{
User
user
=
userService
.
findByPhoneInDb
(
phoneNo
);
if
(
user
==
null
)
{
return
JsonResult
.
buildErrorStateResult
(
""
,
null
);
return
JsonResult
.
buildErrorStateResult
(
"
查无此人
"
,
null
);
}
if
(
tenantId
!=
null
&&
!
TenantUtil
.
TENANT_DEFAULT
.
equals
(
tenantId
))
{
// userId 查询对应productLogin 获取手机号和customerId
user
=
tenantService
.
getTenantUser
(
user
,
tenantId
);
if
(
user
==
null
)
{
return
JsonResult
.
buildErrorStateResult
(
""
,
null
);
return
JsonResult
.
buildErrorStateResult
(
"
查无此人
"
,
null
);
}
}
UserRet
userRet
=
new
UserRet
(
user
);
...
...
@@ -157,14 +157,14 @@ public class InnerController implements IBaseController {
public
JsonResult
findByUuidInfo
(
String
uuid
,
Integer
tenantId
)
{
User
user
=
userService
.
findByUuidWithCache
(
uuid
);
if
(
user
==
null
)
{
return
JsonResult
.
buildErrorStateResult
(
""
,
null
);
return
JsonResult
.
buildErrorStateResult
(
"
查无此人
"
,
null
);
}
if
(
tenantId
!=
null
&&
!
TenantUtil
.
TENANT_DEFAULT
.
equals
(
tenantId
))
{
// userId 查询对应productLogin 获取手机号和customerId
user
=
tenantService
.
getTenantUser
(
user
,
tenantId
);
if
(
user
==
null
)
{
return
JsonResult
.
buildErrorStateResult
(
""
,
null
);
return
JsonResult
.
buildErrorStateResult
(
"
查无此人
"
,
null
);
}
}
UserRet
userRet
=
new
UserRet
(
user
);
...
...
@@ -424,13 +424,13 @@ public class InnerController implements IBaseController {
// userId 查询对应productLogin 获取手机号和customerId
user
=
tenantService
.
getTenantUser
(
user
,
tenantId
);
if
(
user
==
null
)
{
return
JsonResult
.
buildErrorStateResult
(
""
,
null
);
return
JsonResult
.
buildErrorStateResult
(
"
查无此人
"
,
null
);
}
}
return
JsonResult
.
buildSuccessResult
(
null
,
new
UserRet
(
user
));
}
return
JsonResult
.
buildErrorStateResult
(
""
,
null
);
return
JsonResult
.
buildErrorStateResult
(
"
查无此人
"
,
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