diff --git a/src_app_fresh/apx/com/amarsoft/als/base/awe/controller/AweAppDoFlowDoDetailController.java b/src_app_fresh/apx/com/amarsoft/als/base/awe/controller/AweAppDoFlowDoDetailController.java
index 2ef9b46a9..a8927087c 100644
--- a/src_app_fresh/apx/com/amarsoft/als/base/awe/controller/AweAppDoFlowDoDetailController.java
+++ b/src_app_fresh/apx/com/amarsoft/als/base/awe/controller/AweAppDoFlowDoDetailController.java
@@ -73,6 +73,8 @@ public class AweAppDoFlowDoDetailController {
 			}
 			objectNo = bo.getAttribute("OBJECTNO") == null ? "" : bo
 					.getAttribute("OBJECTNO").toString();
+			taskNo = bo.getAttribute("serialno") == null ? "" : bo
+					.getAttribute("serialno").toString();
 			flowNo = bo.getAttribute("FLOWNO") == null ? "" : bo.getAttribute(
 					"FLOWNO").toString();
 			phaseNo = bo.getAttribute("PHASENO") == null ? "" : bo
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 8ae2f94a8..eaf1ff967 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
@@ -78,6 +78,11 @@ public class AweDoQueryController {
 				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");
diff --git a/src_app_fresh/apx/com/amarsoft/als/base/awe/controller/AweDoSaveController.java b/src_app_fresh/apx/com/amarsoft/als/base/awe/controller/AweDoSaveController.java
index c5b4440c8..0d1919b33 100644
--- a/src_app_fresh/apx/com/amarsoft/als/base/awe/controller/AweDoSaveController.java
+++ b/src_app_fresh/apx/com/amarsoft/als/base/awe/controller/AweDoSaveController.java
@@ -65,14 +65,24 @@ public class AweDoSaveController {
 			BizObject bo = FlowTask.queryFlowTask(request, sqlca, tx, fieldMap);
 			String taskNo = fieldMap.get("SERIALNO") == null ? "" : fieldMap
 					.get("SERIALNO").toString();
-			if (null != taskNo && null != bo && null == bo.getAttribute("SERIALNO")) {
-				taskNo = fieldMap.get("SERIALNO").equals(bo
-						.getAttribute("SERIALNO").getValue().toString()) ? ""
-						: fieldMap.get("SERIALNO").toString();
+			if (null != bo) {
+				if (null == bo.getAttribute("SERIALNO")) {
+					ReturnMapUtil.setReturnMap(null,
+							RestfullConstant.baseProperty.get("FAIL")
+									.toString(), "获取流程实例流水号失败!");
+					return ReturnMapUtil.getReturnMap();
+				}
+				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");
 			AppConfigFlow AppConfigFlow = new AppConfigFlow();
diff --git a/src_app_fresh/apx/com/amarsoft/als/base/flow/FlowTask.java b/src_app_fresh/apx/com/amarsoft/als/base/flow/FlowTask.java
index a7b4ca447..ca5650e1e 100644
--- a/src_app_fresh/apx/com/amarsoft/als/base/flow/FlowTask.java
+++ b/src_app_fresh/apx/com/amarsoft/als/base/flow/FlowTask.java
@@ -7,11 +7,13 @@ import javax.servlet.http.HttpServletRequest;
 
 
 
+
 import jbo.sys.FLOW_OBJECT;
 import jbo.sys.FLOW_TASK;
 
 import com.amarsoft.are.jbo.BizObject;
 import com.amarsoft.are.jbo.BizObjectManager;
+import com.amarsoft.are.jbo.BizObjectQuery;
 import com.amarsoft.are.jbo.JBOException;
 import com.amarsoft.are.jbo.JBOFactory;
 import com.amarsoft.are.jbo.JBOTransaction;
@@ -21,6 +23,7 @@ import com.base.util.MultipartDataUtil;
 
 public class FlowTask {
 	private String flowNo;
+	private String userId;
 	private String objectNo;
 //	private String objectType;
 //	private String phaseType;
@@ -67,9 +70,22 @@ public class FlowTask {
 		}
 		objectNo = fieldMap.get("OBJECTNO") == null ? "" : fieldMap.get(
 				"OBJECTNO").toString();
-		serialNo = fieldMap.get("SERIALNO") == null ? "" : fieldMap.get(
-				"SERIALNO").toString();
-		return queryFlowTask(tx);
+		userId = fieldMap.get("userId") == null ? "" : fieldMap.get(
+				"userId").toString();
+		BizObject bo = null;
+		BizObjectManager bm = null;
+		BizObjectQuery bq = null;
+		bm = JBOFactory.getFactory().getManager(FLOW_TASK.CLASS_NAME);
+		bq = bm.createQuery("ObjectNo=:ObjectNo and UserID=:UserID and (EndTime is null or EndTime ='')")
+		.setParameter("ObjectNo",objectNo).setParameter("UserID", userId);
+		bo = bq.getSingleResult(false);
+		return bo;
+//		
+//		
+//		
+//		serialNo = fieldMap.get("SERIALNO") == null ? "" : fieldMap.get(
+//				"SERIALNO").toString();
+//		return queryFlowTask(tx);
 	}
 
 	public BizObject queryFlowTask(JBOTransaction tx) throws Exception {
diff --git a/src_app_fresh/apx/com/amarsoft/als/business/action/scenario/AutoRiskScanService.java b/src_app_fresh/apx/com/amarsoft/als/business/action/scenario/AutoRiskScanService.java
index 5af8dfc21..24df39625 100644
--- a/src_app_fresh/apx/com/amarsoft/als/business/action/scenario/AutoRiskScanService.java
+++ b/src_app_fresh/apx/com/amarsoft/als/business/action/scenario/AutoRiskScanService.java
@@ -102,6 +102,11 @@ public class AutoRiskScanService {
 				this.bizArgs = "ObjectType=" + objectType + "&ObjectNo="
 						+ objectNo + "&FlowNo=" + flowNo + "&PhaseNo=" + phaseNo + "&TaskNo="
 						+ taskNo + "&UserId=" + userId + "&isAutoCommit=true";
+			} else {
+				ReturnMapUtil.setReturnMap(null,
+						RestfullConstant.baseProperty.get("FAIL")
+								.toString(), "未找到该流程!");
+				return ReturnMapUtil.getReturnMap();
 			}
 		}
 		BizObject task = GetFlowAction.getFlowTaskParams(taskNo);