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
edda78c8
Commit
edda78c8
authored
Aug 17, 2020
by
zhiwj
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
单域版
parent
12a56d13
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
5 deletions
+6
-5
ResourceApiServiceImpl.java
...m/gic/auth/service/outer/impl/ResourceApiServiceImpl.java
+4
-3
ResourceController.java
.../java/com/gic/auth/web/controller/ResourceController.java
+2
-2
No files found.
gic-platform-auth-service/src/main/java/com/gic/auth/service/outer/impl/ResourceApiServiceImpl.java
View file @
edda78c8
...
...
@@ -17,6 +17,7 @@ import com.gic.commons.util.EntityUtil;
import
com.gic.commons.util.PageHelperUtils
;
import
com.gic.enterprise.error.ErrorCode
;
import
com.gic.enterprise.response.EnterpriseServiceResponse
;
import
com.gic.enterprise.service.EnterpriseApiService
;
import
com.gic.member.config.api.dto.AppletsConfigSimpleOutputDTO
;
import
com.gic.member.config.api.dto.OwnerMemberCardDTO
;
import
com.gic.member.config.api.dto.ServiceConfigSimpleOutputDTO
;
...
...
@@ -25,7 +26,6 @@ import com.gic.member.config.api.service.MemberCardApiService;
import
com.gic.member.config.api.service.ServiceConfigApiService
;
import
com.gic.member.filter.api.dto.CrowdWidgetDTO
;
import
com.gic.member.filter.api.service.CrowdWidgetApiService
;
import
com.gic.open.api.dto.EnterpriseServeInfoDTO
;
import
com.gic.open.api.service.EnterpriseLicenseApiService
;
import
com.gic.store.service.StoreWidgetApiService
;
import
org.apache.commons.collections.CollectionUtils
;
...
...
@@ -73,6 +73,8 @@ public class ResourceApiServiceImpl implements ResourceApiService {
private
CrowdWidgetApiService
crowdWidgetApiService
;
@Autowired
private
EnterpriseLicenseApiService
enterpriseLicenseApiService
;
@Autowired
private
EnterpriseApiService
enterpriseApiService
;
@Override
@Transactional
...
...
@@ -280,8 +282,7 @@ public class ResourceApiServiceImpl implements ResourceApiService {
return
EnterpriseServiceResponse
.
failure
(
ErrorCode
.
NOTEXISTS
);
}
ServiceResponse
<
EnterpriseServeInfoDTO
>
serveInfo
=
enterpriseLicenseApiService
.
getServeInfo
(
user
.
getEnterpriseId
(),
"gic"
);
if
(
user
.
getSuperAdmin
()
==
1
||
"basic"
.
equals
(
serveInfo
.
getResult
().
getVersionCode
()))
{
if
(
user
.
getSuperAdmin
()
==
1
||
"basic"
.
equals
(
enterpriseApiService
.
getEnterpriseById
(
user
.
getEnterpriseId
()).
getResult
().
getVersionCode
()))
{
List
<
OwnerMemberCardDTO
>
memberCardList
=
memberCardApiService
.
getAllContainDel
(
user
.
getEnterpriseId
()).
getResult
();
List
<
AppletsConfigSimpleOutputDTO
>
appletList
=
appletsConfigApiService
.
listAppletConfigAppIdContainDel
(
user
.
getEnterpriseId
()).
getResult
();
List
<
ServiceConfigSimpleOutputDTO
>
serviceList
=
serviceConfigApiService
.
listServiceConfigAppIdContainDel
(
user
.
getEnterpriseId
()).
getResult
();
...
...
gic-platform-auth-web/src/main/java/com/gic/auth/web/controller/ResourceController.java
View file @
edda78c8
...
...
@@ -81,8 +81,8 @@ public class ResourceController {
}
}
@RequestMapping
(
"/save-resource"
)
public
RestResponse
saveResource
(
@RequestBody
ResourceQO
resourceQO
)
{
@RequestMapping
(
"/save-resource"
)
public
RestResponse
saveResource
(
@RequestBody
ResourceQO
resourceQO
)
{
ResourceDTO
resourceDTO
=
EntityUtil
.
changeEntityByJSON
(
ResourceDTO
.
class
,
resourceQO
);
resourceDTO
.
setEnterpriseId
(
UserDetailUtils
.
getUserDetail
().
getEnterpriseId
());
...
...
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