Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
T
test
Project
Project
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
邬友楠
test
Commits
d8f29bf5
Commit
d8f29bf5
authored
May 07, 2020
by
雍欢
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复:数据管理权限 permissions标签判断逻辑错误
parent
8c51a598
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
5 deletions
+6
-5
SQLBuilderImpl.java
...ava/com/huigou/data/query/parser/impl/SQLBuilderImpl.java
+6
-5
No files found.
huigou-data/src/main/java/com/huigou/data/query/parser/impl/SQLBuilderImpl.java
View file @
d8f29bf5
package
com
.
huigou
.
data
.
query
.
parser
.
impl
;
package
com
.
huigou
.
data
.
query
.
parser
.
impl
;
import
java.util.Map
;
import
java.util.regex.Matcher
;
import
com.huigou.data.domain.query.QueryAbstractRequest
;
import
com.huigou.data.domain.query.QueryAbstractRequest
;
import
com.huigou.data.query.QueryPermissionBuilder
;
import
com.huigou.data.query.QueryPermissionBuilder
;
import
com.huigou.data.query.SQLExecutor
;
import
com.huigou.data.query.SQLExecutor
;
...
@@ -16,9 +19,7 @@ import com.huigou.uasp.bmp.query.PermissionsDocument.Permissions;
...
@@ -16,9 +19,7 @@ import com.huigou.uasp.bmp.query.PermissionsDocument.Permissions;
import
com.huigou.uasp.bmp.query.QueryDocument.Query
;
import
com.huigou.uasp.bmp.query.QueryDocument.Query
;
import
com.huigou.uasp.bmp.query.SqlDocument.Sql
;
import
com.huigou.uasp.bmp.query.SqlDocument.Sql
;
import
com.huigou.util.StringUtil
;
import
com.huigou.util.StringUtil
;
import
org.apache.commons.lang3.ArrayUtils
;
import
java.util.Map
;
import
java.util.regex.Matcher
;
/**
/**
* 根据查询对象组合SQL
* 根据查询对象组合SQL
...
@@ -120,7 +121,7 @@ public class SQLBuilderImpl implements SQLBuilder {
...
@@ -120,7 +121,7 @@ public class SQLBuilderImpl implements SQLBuilder {
private
PermissionGroup
parsePermissions
(
Permissions
permissions
)
{
private
PermissionGroup
parsePermissions
(
Permissions
permissions
)
{
PermissionGroup
permissionGroup
=
PermissionGroup
.
newInstance
(
permissions
);
PermissionGroup
permissionGroup
=
PermissionGroup
.
newInstance
(
permissions
);
Permission
[]
permissionArray
=
permissions
.
getPermissionArray
();
Permission
[]
permissionArray
=
permissions
.
getPermissionArray
();
if
(
permissionArray
!=
null
&&
permissionArray
.
length
>
0
)
{
if
(
ArrayUtils
.
isNotEmpty
(
permissionArray
)
)
{
for
(
Permission
xmlObj
:
permissionArray
)
{
for
(
Permission
xmlObj
:
permissionArray
)
{
PermissionModel
permission
=
PermissionModel
.
newInstance
(
xmlObj
);
PermissionModel
permission
=
PermissionModel
.
newInstance
(
xmlObj
);
permission
.
setFormula
(
XMLParseUtil
.
getNodeTextValue
(
xmlObj
));
permission
.
setFormula
(
XMLParseUtil
.
getNodeTextValue
(
xmlObj
));
...
@@ -128,7 +129,7 @@ public class SQLBuilderImpl implements SQLBuilder {
...
@@ -128,7 +129,7 @@ public class SQLBuilderImpl implements SQLBuilder {
}
}
}
}
Permissions
[]
permissionsArray
=
permissions
.
getPermissionsArray
();
Permissions
[]
permissionsArray
=
permissions
.
getPermissionsArray
();
if
(
permissionArray
!=
null
&&
permissionArray
.
length
>
0
)
{
if
(
ArrayUtils
.
isNotEmpty
(
permissionsArray
)
)
{
for
(
Permissions
xmlObj
:
permissionsArray
)
{
for
(
Permissions
xmlObj
:
permissionsArray
)
{
permissionGroup
.
addPermissionGroup
(
this
.
parsePermissions
(
xmlObj
));
permissionGroup
.
addPermissionGroup
(
this
.
parsePermissions
(
xmlObj
));
}
}
...
...
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