Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gic-platform-enterprise
Overview
Overview
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
base_platform_enterprise
gic-platform-enterprise
Commits
0c054990
Commit
0c054990
authored
Jul 17, 2019
by
guojuxing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
报名修改
parent
fdaa5f8f
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
5 deletions
+15
-5
EnterpriseController.java
...om/gic/operation/web/controller/EnterpriseController.java
+2
-2
UserController.java
...java/com/gic/operation/web/controller/UserController.java
+13
-3
No files found.
gic-platform-operation-web/src/main/java/com/gic/operation/web/controller/EnterpriseController.java
View file @
0c054990
...
...
@@ -70,9 +70,9 @@ public class EnterpriseController {
@RequestMapping
(
"/get-enterprise"
)
public
RestResponse
editEnterprise
(
Integer
enterpriseId
)
{
ServiceResponse
enterpriseResult
=
enterpriseApiService
.
getEnterpriseById
(
enterpriseId
);
ServiceResponse
<
EnterpriseDTO
>
enterpriseResult
=
enterpriseApiService
.
getEnterpriseById
(
enterpriseId
);
if
(
enterpriseResult
.
isSuccess
())
{
return
RestResponse
.
success
();
return
RestResponse
.
success
(
enterpriseResult
.
getResult
()
);
}
else
{
return
EnterpriseRestResponse
.
failure
(
enterpriseResult
);
}
...
...
gic-platform-operation-web/src/main/java/com/gic/operation/web/controller/UserController.java
View file @
0c054990
...
...
@@ -59,11 +59,21 @@ public class UserController {
}
}
@RequestMapping
(
"/get-user-by-id"
)
public
RestResponse
getUserById
(
Integer
userId
)
{
ServiceResponse
<
UserDTO
>
enterpriseResult
=
userApiService
.
getUserById
(
userId
);
if
(
enterpriseResult
.
isSuccess
())
{
return
RestResponse
.
success
(
enterpriseResult
.
getResult
());
}
else
{
return
EnterpriseRestResponse
.
failure
(
enterpriseResult
);
}
}
@RequestMapping
(
"/get-user"
)
public
RestResponse
getUser
(
Integer
userId
)
{
ServiceResponse
enterpriseResult
=
userApiService
.
getUserById
(
userId
);
public
RestResponse
getUser
()
{
ServiceResponse
<
UserDTO
>
enterpriseResult
=
userApiService
.
getUserByEnterpriseId
(
StoreGroupConstant
.
TEST_ENTERPRISE_ID
);
if
(
enterpriseResult
.
isSuccess
())
{
return
RestResponse
.
success
();
return
RestResponse
.
success
(
enterpriseResult
.
getResult
()
);
}
else
{
return
EnterpriseRestResponse
.
failure
(
enterpriseResult
);
}
...
...
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