Commit d8f29bf5 authored by 雍欢's avatar 雍欢

修复:数据管理权限 permissions标签判断逻辑错误

parent 8c51a598
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));
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment