Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gic-platform-auth
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-auth
Commits
1e746825
Commit
1e746825
authored
Oct 11, 2019
by
zhiwj
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加商户id判断
parent
cef2640f
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
16 deletions
+17
-16
AuditorApiServiceImpl.java
...om/gic/auth/service/outer/impl/AuditorApiServiceImpl.java
+1
-1
TabSysResourceMapper.xml
...ervice/src/main/resources/mapper/TabSysResourceMapper.xml
+3
-0
LoginController.java
...ain/java/com/gic/auth/web/controller/LoginController.java
+13
-15
No files found.
gic-platform-auth-service/src/main/java/com/gic/auth/service/outer/impl/AuditorApiServiceImpl.java
View file @
1e746825
...
...
@@ -158,7 +158,7 @@ public class AuditorApiServiceImpl implements AuditorApiService {
String
codeUrl
=
this
.
getTempQrCodeUrl
(
auditorId
);
auditorDTO
.
setHeadUrl
(
codeUrl
);
}
else
{
ServiceResponse
<
ServiceUserDTO
>
service
=
this
.
serviceUserApiService
.
getByOpenid
(
auditorDTO
.
getOpenid
()
,
auditor
.
getEnterpriseId
()
);
ServiceResponse
<
ServiceUserDTO
>
service
=
this
.
serviceUserApiService
.
getByOpenid
(
auditorDTO
.
getOpenid
());
if
(
service
.
isSuccess
())
{
ServiceUserDTO
userDTO
=
service
.
getResult
();
String
headUrl
=
userDTO
.
getHeadUrl
();
...
...
gic-platform-auth-service/src/main/resources/mapper/TabSysResourceMapper.xml
View file @
1e746825
...
...
@@ -194,6 +194,9 @@
<if
test=
"resourceName != null and resourceName != '' "
>
and resource_name like concat('%', #{resourceName}, '%')
</if>
<if
test=
"enterpriseId != null "
>
and enterprise_id = #{enterpriseId}
</if>
</select>
<select
id=
"getBySelective"
resultMap=
"BaseResultMap"
>
select
...
...
gic-platform-auth-web/src/main/java/com/gic/auth/web/controller/LoginController.java
View file @
1e746825
package
com
.
gic
.
auth
.
web
.
controller
;
import
java.util.ArrayList
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.Map
;
import
com.gic.enterprise.base.UserInfo
;
import
org.apache.commons.collections.CollectionUtils
;
import
org.apache.commons.lang.StringUtils
;
import
org.apache.log4j.LogManager
;
import
org.apache.log4j.Logger
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RestController
;
import
com.gic.api.base.commons.ServiceResponse
;
import
com.gic.auth.dto.MenuDTO
;
import
com.gic.auth.dto.UserDTO
;
...
...
@@ -23,12 +9,25 @@ import com.gic.commons.util.EntityUtil;
import
com.gic.commons.util.Md5Util
;
import
com.gic.commons.webapi.reponse.RestResponse
;
import
com.gic.enterprise.base.EnterpriseInfo
;
import
com.gic.enterprise.base.UserInfo
;
import
com.gic.enterprise.dto.EnterpriseDTO
;
import
com.gic.enterprise.error.ErrorCode
;
import
com.gic.enterprise.response.EnterpriseRestResponse
;
import
com.gic.enterprise.service.EnterpriseApiService
;
import
com.gic.enterprise.utils.UserDetail
;
import
com.gic.enterprise.utils.UserDetailUtils
;
import
org.apache.commons.collections.CollectionUtils
;
import
org.apache.commons.lang.StringUtils
;
import
org.apache.log4j.LogManager
;
import
org.apache.log4j.Logger
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RestController
;
import
java.util.ArrayList
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.Map
;
@RestController
public
class
LoginController
{
...
...
@@ -93,7 +92,6 @@ public class LoginController {
if
(
enterprise
.
isSuccess
()){
EnterpriseDTO
enterpriseDTO
=
enterprise
.
getResult
();
if
(
enterpriseDTO
!=
null
){
userDetail
.
setEnterpriseId
(
enterpriseDTO
.
getEnterpriseId
());
userDetail
.
setEnterpriseInfo
(
EntityUtil
.
changeEntityNew
(
EnterpriseInfo
.
class
,
enterpriseDTO
));
ServiceResponse
<
List
<
MenuDTO
>>
menuResult
=
menuApiService
.
listUserMenu
(
userDetail
.
getUserId
());
...
...
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