Merge branch 'fix/数据中心数据表查询权限错误' into 'develop'

修复数据中心数据表查询权限错误

See merge request o2oa/o2oa!384

o2server/x_query_assemble_surface/src/main/java/com/x/query/assemble/surface/jaxrs/table/ActionListRowNext.java

@@ -31,9 +31,8 @@ class ActionListRowNext extends BaseAction {
 	ActionResult<List<JsonObject>> execute(EffectivePerson effectivePerson, String tableFlag, String id, Integer count)
 			throws Exception {
 		try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) {
-
+			logger.debug(effectivePerson.getDistinguishedName());
 			ActionResult<List<JsonObject>> result = new ActionResult<>();
-			logger.debug(effectivePerson, "table:{}, id:{}, count:{}.", tableFlag, id, count);
 			Business business = new Business(emc);
 			Table table = emc.flag(tableFlag, Table.class);
 			if (null == table) {

o2server/x_query_assemble_surface/src/main/java/com/x/query/assemble/surface/jaxrs/table/ActionListRowSelect.java

@@ -29,7 +29,7 @@ class ActionListRowSelect extends BaseAction {
 			if (null == table) {
 				throw new ExceptionEntityNotExist(tableFlag, Table.class);
 			}
-			if (!business.editable(effectivePerson, table)) {
+			if (!business.readable(effectivePerson, table)) {
 				throw new ExceptionAccessDenied(effectivePerson, table);
 			}
 			DynamicEntity dynamicEntity = new DynamicEntity(table.getName());

o2server/x_query_assemble_surface/src/main/java/com/x/query/assemble/surface/jaxrs/table/ActionListRowSelectWhere.java

@@ -27,7 +27,7 @@ class ActionListRowSelectWhere extends BaseAction {
 			if (null == table) {
 				throw new ExceptionEntityNotExist(tableFlag, Table.class);
 			}
-			if (!business.editable(effectivePerson, table)) {
+			if (!business.readable(effectivePerson, table)) {
 				throw new ExceptionAccessDenied(effectivePerson, table);
 			}
 			DynamicEntity dynamicEntity = new DynamicEntity(table.getName());

o2server/x_query_assemble_surface/src/main/java/com/x/query/assemble/surface/jaxrs/table/ActionRowCountWhere.java

@@ -27,7 +27,7 @@ class ActionRowCountWhere extends BaseAction {
 			if (null == table) {
 				throw new ExceptionEntityNotExist(tableFlag, Table.class);
 			}
-			if (!business.editable(effectivePerson, table)) {
+			if (!business.readable(effectivePerson, table)) {
 				throw new ExceptionAccessDenied(effectivePerson, table);
 			}
 			DynamicEntity dynamicEntity = new DynamicEntity(table.getName());
@@ -50,4 +50,4 @@ class ActionRowCountWhere extends BaseAction {
 
 	}
 
-}
\ No newline at end of file
+}

o2server/x_query_assemble_surface/src/main/java/com/x/query/assemble/surface/jaxrs/table/ActionRowGet.java

@@ -20,7 +20,7 @@ class ActionRowGet extends BaseAction {
 			if (null == table) {
 				throw new ExceptionEntityNotExist(tableFlag, Table.class);
 			}
-			if (!business.editable(effectivePerson, table)) {
+			if (!business.readable(effectivePerson, table)) {
 				throw new ExceptionAccessDenied(effectivePerson, table);
 			}
 			DynamicEntity dynamicEntity = new DynamicEntity(table.getName());
@@ -32,4 +32,4 @@ class ActionRowGet extends BaseAction {
 		}
 	}
 
-}
\ No newline at end of file
+}