Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
cloud-platform
Project
Project
Details
Activity
Releases
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
youjj
cloud-platform
Commits
eda052ce
Commit
eda052ce
authored
Oct 22, 2020
by
周健威
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改申请接口
parent
c7a15132
Changes
2
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
229 additions
and
34 deletions
+229
-34
UserRestInterface.java
.../wxiaoqi/security/admin/feign/rest/UserRestInterface.java
+9
-9
ShuntApplyController.java
...va/com/xxfc/platform/order/rest/ShuntApplyController.java
+220
-25
No files found.
ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/feign/rest/UserRestInterface.java
View file @
eda052ce
...
@@ -20,8 +20,6 @@ import java.util.List;
...
@@ -20,8 +20,6 @@ import java.util.List;
public
interface
UserRestInterface
{
public
interface
UserRestInterface
{
public
UserFeign
getUserFeign
();
public
UserFeign
getUserFeign
();
default
HttpServletRequest
getRequest
()
{
default
HttpServletRequest
getRequest
()
{
return
((
ServletRequestAttributes
)
RequestContextHolder
.
getRequestAttributes
()).
getRequest
();
return
((
ServletRequestAttributes
)
RequestContextHolder
.
getRequestAttributes
()).
getRequest
();
}
}
...
@@ -111,16 +109,18 @@ public interface UserRestInterface {
...
@@ -111,16 +109,18 @@ public interface UserRestInterface {
}
}
default
List
<
Integer
>
getBusinessUserCompanyIds
(){
default
List
<
Integer
>
getBusinessUserCompanyIds
(){
//Integer currentUserIdInt = getCurrentUserIdInt();
UserDTO
userDTO
=
getBusinessUserByAppUser
();
if
(
getBusinessUserByAppUser
()
!=
null
){
return
userDTO
.
getCompanyIds
();
}
return
null
;
}
default
UserDTO
getBusinessUserByAppUser
(){
String
currentUserName
=
BaseContextHandler
.
getUsername
();
String
currentUserName
=
BaseContextHandler
.
getUsername
();
if
(
StrUtil
.
isNotBlank
(
currentUserName
)){
if
(
StrUtil
.
isNotBlank
(
currentUserName
)){
ObjectRestResponse
<
UserDTO
>
restResponse
=
getUserFeign
().
businessUserinfoByMobilePhone
(
currentUserName
);
ObjectRestResponse
<
UserDTO
>
restResponse
=
getUserFeign
().
businessUserinfoByMobilePhone
(
currentUserName
);
if
(
restResponse
.
getData
()
!=
null
){
return
restResponse
.
getData
();
UserDTO
userDTO
=
restResponse
.
getData
();
if
(
userDTO
!=
null
){
return
userDTO
.
getCompanyIds
();
}
}
}
}
return
null
;
return
null
;
}
}
...
...
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/ShuntApplyController.java
View file @
eda052ce
This diff is collapsed.
Click to expand it.
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