From 30d191e11fca25da4f98e593260119febd9983cc Mon Sep 17 00:00:00 2001
From: liujiaji <liujj@tenwa.com.cn>
Date: Tue, 26 Jun 2018 09:46:40 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9D=9E=E6=B5=81=E7=A8=8B=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../awe/controller/AweDoQueryController.java  | 35 ++++++++++---------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/src_app_fresh/apx/com/amarsoft/als/base/awe/controller/AweDoQueryController.java b/src_app_fresh/apx/com/amarsoft/als/base/awe/controller/AweDoQueryController.java
index eaf1ff967..3b54d4e3d 100644
--- a/src_app_fresh/apx/com/amarsoft/als/base/awe/controller/AweDoQueryController.java
+++ b/src_app_fresh/apx/com/amarsoft/als/base/awe/controller/AweDoQueryController.java
@@ -62,27 +62,28 @@ public class AweDoQueryController {
 			fieldMap.put("FLOWUNID".toLowerCase(), objectNo);
 			fieldMap.put("FLOW_UNID", objectNo);
 			fieldMap.put("FLOW_UNID".toLowerCase(), objectNo);
-
-			FlowTask FlowTask = new FlowTask();
-			BizObject bo = FlowTask.queryFlowTask(request, sqlca, tx, fieldMap);
-			if (null != bo) {
-				if (null == bo.getAttribute("SERIALNO")) {
+			if (objectNo.length() < 1) {
+				FlowTask FlowTask = new FlowTask();
+				BizObject bo = FlowTask.queryFlowTask(request, sqlca, tx, fieldMap);
+				if (null != bo) {
+					if (null == bo.getAttribute("SERIALNO")) {
+						ReturnMapUtil.setReturnMap(null,
+								RestfullConstant.baseProperty.get("FAIL")
+										.toString(), "获取流程实例流水号失败!");
+						return ReturnMapUtil.getReturnMap();
+					}
+					String taskNo = bo.getAttribute("SERIALNO").getValue()
+							.toString();
+					fieldMap.put("taskNo", taskNo);
+					fieldMap.put("taskNo".toLowerCase(), taskNo);
+					fieldMap.put("task_no", taskNo);
+					fieldMap.put("task_No".toLowerCase(), taskNo);
+				} else {
 					ReturnMapUtil.setReturnMap(null,
 							RestfullConstant.baseProperty.get("FAIL")
-									.toString(), "获取流程实例流水号失败!");
+									.toString(), "未找到该流程!");
 					return ReturnMapUtil.getReturnMap();
 				}
-				String taskNo = bo.getAttribute("SERIALNO").getValue()
-						.toString();
-				fieldMap.put("taskNo", taskNo);
-				fieldMap.put("taskNo".toLowerCase(), taskNo);
-				fieldMap.put("task_no", taskNo);
-				fieldMap.put("task_No".toLowerCase(), taskNo);
-			} else {
-				ReturnMapUtil.setReturnMap(null,
-						RestfullConstant.baseProperty.get("FAIL")
-								.toString(), "未找到该流程!");
-				return ReturnMapUtil.getReturnMap();
 			}
 
 			String id = request.getParameter("id");