Merge branch 'fix/queryUpdate' into 'develop'

jpql无法运行update的bug

See merge request o2oa/o2oa!907

o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/statement/ActionExecute.java

@@ -51,12 +51,12 @@ class ActionExecute extends BaseAction {
 			Object data = null;
 
 			switch (Objects.toString(statement.getFormat(), "")) {
-			case Statement.FORMAT_SCRIPT:
-				data = this.script(effectivePerson, business, statement, runtime);
-				break;
-			default:
-				data = this.jpql(effectivePerson, business, statement, runtime);
-				break;
+				case Statement.FORMAT_SCRIPT:
+					data = this.script(effectivePerson, business, statement, runtime);
+					break;
+				default:
+					data = this.jpql(effectivePerson, business, statement, runtime);
+					break;
 			}
 			result.setData(data);
 			return result;
@@ -79,9 +79,9 @@ class ActionExecute extends BaseAction {
 				query.setParameter(p.getName(), runtime.getParameter(p.getName()));
 			}
 		}
-		query.setFirstResult((runtime.page - 1) * runtime.size);
-		query.setMaxResults(runtime.size);
 		if (StringUtils.equalsIgnoreCase(statement.getType(), Statement.TYPE_SELECT)) {
+			query.setFirstResult((runtime.page - 1) * runtime.size);
+			query.setMaxResults(runtime.size);
 			data = query.getResultList();
 		} else {
 			business.entityManagerContainer().beginTransaction(cls);
@@ -102,13 +102,13 @@ class ActionExecute extends BaseAction {
 				query.setParameter(p.getName(), runtime.getParameter(p.getName()));
 			}
 		}
-		query.setFirstResult((runtime.page - 1) * runtime.size);
-		query.setMaxResults(runtime.size);
 		if (StringUtils.equalsIgnoreCase(statement.getType(), Statement.TYPE_SELECT)) {
+			query.setFirstResult((runtime.page - 1) * runtime.size);
+			query.setMaxResults(runtime.size);
 			data = query.getResultList();
 		} else {
 			business.entityManagerContainer().beginTransaction(cls);
-			data = query.executeUpdate();
+			data = Integer.valueOf(query.executeUpdate());
 			business.entityManagerContainer().commit();
 		}
 		return data;

o2server/x_query_assemble_surface/src/main/java/com/x/query/assemble/surface/jaxrs/statement/ActionExecute.java

@@ -56,12 +56,12 @@ class ActionExecute extends BaseAction {
 			Object data = null;
 
 			switch (Objects.toString(statement.getFormat(), "")) {
-			case Statement.FORMAT_SCRIPT:
-				data = this.script(effectivePerson, business, statement, runtime);
-				break;
-			default:
-				data = this.jpql(effectivePerson, business, statement, runtime);
-				break;
+				case Statement.FORMAT_SCRIPT:
+					data = this.script(effectivePerson, business, statement, runtime);
+					break;
+				default:
+					data = this.jpql(effectivePerson, business, statement, runtime);
+					break;
 			}
 			result.setData(data);
 			return result;
@@ -116,9 +116,9 @@ class ActionExecute extends BaseAction {
 				query.setParameter(p.getName(), runtime.getParameter(p.getName()));
 			}
 		}
-		query.setFirstResult((runtime.page - 1) * runtime.size);
-		query.setMaxResults(runtime.size);
 		if (StringUtils.equalsIgnoreCase(statement.getType(), Statement.TYPE_SELECT)) {
+			query.setFirstResult((runtime.page - 1) * runtime.size);
+			query.setMaxResults(runtime.size);
 			data = query.getResultList();
 		} else {
 			business.entityManagerContainer().beginTransaction(cls);
@@ -139,9 +139,9 @@ class ActionExecute extends BaseAction {
 				query.setParameter(p.getName(), runtime.getParameter(p.getName()));
 			}
 		}
-		query.setFirstResult((runtime.page - 1) * runtime.size);
-		query.setMaxResults(runtime.size);
 		if (StringUtils.equalsIgnoreCase(statement.getType(), Statement.TYPE_SELECT)) {
+			query.setFirstResult((runtime.page - 1) * runtime.size);
+			query.setMaxResults(runtime.size);
 			data = query.getResultList();
 		} else {
 			business.entityManagerContainer().beginTransaction(cls);