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
073522f2
Commit
073522f2
authored
Nov 06, 2019
by
zhiwj
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
资源组修改获取方式
parent
a2a7c417
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
46 deletions
+4
-46
ResourceController.java
.../java/com/gic/auth/web/controller/ResourceController.java
+1
-1
AppResourceVO.java
...-web/src/main/java/com/gic/auth/web/vo/AppResourceVO.java
+0
-42
ResourceVO.java
...uth-web/src/main/java/com/gic/auth/web/vo/ResourceVO.java
+3
-3
No files found.
gic-platform-auth-web/src/main/java/com/gic/auth/web/controller/ResourceController.java
View file @
073522f2
...
...
@@ -178,7 +178,7 @@ public class ResourceController {
vo
.
setOrderResourceJSON
(
orderResourceList
);
}
if
(
StringUtils
.
isNotBlank
(
dto
.
getAppResourceJson
()))
{
List
<
AppResourceVO
>
appResourceList
=
JSON
.
parseArray
(
dto
.
getAppResourceJson
(),
AppResourceVO
.
class
);
List
<
List
>
appResourceList
=
JSON
.
parseArray
(
dto
.
getAppResourceJson
(),
List
.
class
);
vo
.
setAppResourceJSON
(
appResourceList
);
}
ServiceResponse
<
GoodsRightsSelectorDTO
>
goodsResponse
=
this
.
goodsRightsSelectorApiService
.
getGoodsRightsSelector
(
response
.
getResult
().
getGoodsResourceId
());
...
...
gic-platform-auth-web/src/main/java/com/gic/auth/web/vo/AppResourceVO.java
deleted
100644 → 0
View file @
a2a7c417
package
com
.
gic
.
auth
.
web
.
vo
;
import
java.io.Serializable
;
import
java.util.List
;
/**
*
* @Description:
* @author zhiwj
* @date 2019-09-27 10:23
*/
public
class
AppResourceVO
implements
Serializable
{
private
static
final
long
serialVersionUID
=
-
495359852430529567L
;
private
Integer
appId
;
private
String
appName
;
private
List
<
AppResourceVO
>
child
;
public
Integer
getAppId
()
{
return
appId
;
}
public
void
setAppId
(
Integer
appId
)
{
this
.
appId
=
appId
;
}
public
String
getAppName
()
{
return
appName
;
}
public
void
setAppName
(
String
appName
)
{
this
.
appName
=
appName
;
}
public
List
<
AppResourceVO
>
getChild
()
{
return
child
;
}
public
void
setChild
(
List
<
AppResourceVO
>
child
)
{
this
.
child
=
child
;
}
}
gic-platform-auth-web/src/main/java/com/gic/auth/web/vo/ResourceVO.java
View file @
073522f2
...
...
@@ -51,7 +51,7 @@ public class ResourceVO implements Serializable{
*/
private
List
<
OrderResourceVO
>
orderResourceJSON
;
private
List
<
AppResourceVO
>
appResourceJSON
;
private
List
<
List
>
appResourceJSON
;
private
Integer
userResourceCount
;
private
StoreResouceVO
storeResouce
;
...
...
@@ -121,11 +121,11 @@ public class ResourceVO implements Serializable{
this
.
orderResourceJSON
=
orderResourceJSON
;
}
public
List
<
AppResourceVO
>
getAppResourceJSON
()
{
public
List
<
List
>
getAppResourceJSON
()
{
return
appResourceJSON
;
}
public
void
setAppResourceJSON
(
List
<
AppResourceVO
>
appResourceJSON
)
{
public
void
setAppResourceJSON
(
List
<
List
>
appResourceJSON
)
{
this
.
appResourceJSON
=
appResourceJSON
;
}
...
...
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