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 ca5650e1e..01d7f299e 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
@@ -1,119 +1,122 @@
-package apx.com.amarsoft.als.base.flow;
-
-import java.util.Map;
-
-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;
-import com.amarsoft.are.lang.StringX;
-import com.amarsoft.awe.util.Transaction;
-import com.base.util.MultipartDataUtil;
-
-public class FlowTask {
-	private String flowNo;
-	private String userId;
-	private String objectNo;
-//	private String objectType;
-//	private String phaseType;
-//	private String applyType;
-	private String serialNo;
-//	private String userId;
-
-//	public void setObjectType(String objectType) {
-//		this.objectType = objectType;
-//	}
-//
-//	public void setPhaseType(String phaseType) {
-//		this.phaseType = phaseType;
-//	}
-//
-//	public void setApplyType(String applyType) {
-//		this.applyType = applyType;
-//	}
-//
-//	public void setUserId(String userId) {
-//		this.userId = userId;
-//	}
-
-	public void setSerialNo(String serialNo) {
-		this.serialNo = serialNo;
-	}
-
-	public void setFlowNo(String flowNo) {
-		this.flowNo = flowNo;
-	}
-
-	public void setObjectNo(String objectNo) {
-		this.objectNo = objectNo;
-	}
-
-	@SuppressWarnings("unchecked")
-	public BizObject queryFlowTask(HttpServletRequest request,
-			Transaction sqlca, JBOTransaction tx, Map<String, Object> fieldMap)
-			throws Exception {
-		if (null == fieldMap) {
-			Map<String, Object> testMap = (Map<String, Object>) MultipartDataUtil
-					.readRequestParam(request, "UTF-8");
-			fieldMap = (Map<String, Object>) testMap.get("fieldMap");
-		}
-		objectNo = fieldMap.get("OBJECTNO") == null ? "" : fieldMap.get(
-				"OBJECTNO").toString();
-		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 {
-		String sSql = "SELECT O.* FROM O,";
-		sSql += FLOW_OBJECT.CLASS_NAME + " FLOW_OBJECT ";
-		sSql += "WHERE FLOW_OBJECT.OBJECTNO=O.OBJECTNO ";
-		sSql += "AND FLOW_OBJECT.FLOWNO=O.FLOWNO ";
-		sSql += "AND FLOW_OBJECT.PHASENO=O.PHASENO ";
-		sSql += "AND FLOW_OBJECT.PHASETYPE=O.PHASETYPE ";
-		sSql += "AND FLOW_OBJECT.OBJECTNO='" + objectNo + "' ";
-		BizObjectManager bom = JBOFactory
-				.getBizObjectManager(FLOW_TASK.CLASS_NAME);
-
-		sSql = (!StringX.isSpace(this.serialNo)) ? "SERIALNO='" + serialNo
-				+ "'" : sSql;
-		return bom.createQuery(sSql).getSingleResult(false);
-	}
-
-	public BizObject queryFlowTaskByFlowObject(JBOTransaction tx)
-			throws JBOException {
-		BizObjectManager bom = JBOFactory
-				.getBizObjectManager(FLOW_TASK.CLASS_NAME);
-		return bom
-				.createQuery(
-						"SELECT O.* FROM O, "
-								+ FLOW_OBJECT.CLASS_NAME
-								+ " FLOW_OBJECT WHERE FLOW_OBJECT.OBJECTNO=O.OBJECTNO AND FLOW_OBJECT.PHASENO=O.PHASENO AND FLOW_OBJECT.FLOWNO=:FLOWNO AND FLOW_OBJECT.OBJECTNO=:OBJECTNO")
-				.setParameter("FLOWNO", flowNo)
-				.setParameter("OBJECTNO", objectNo).getSingleResult(false);
-	}
-}
+package apx.com.amarsoft.als.base.flow;
+
+import java.util.Map;
+
+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;
+import com.amarsoft.are.lang.StringX;
+import com.amarsoft.awe.util.Transaction;
+import com.amarsoft.context.ASUser;
+import com.base.util.MultipartDataUtil;
+
+public class FlowTask {
+	private String flowNo;
+	private String userId;
+	private String objectNo;
+//	private String objectType;
+//	private String phaseType;
+//	private String applyType;
+	private String serialNo;
+//	private String userId;
+
+//	public void setObjectType(String objectType) {
+//		this.objectType = objectType;
+//	}
+//
+//	public void setPhaseType(String phaseType) {
+//		this.phaseType = phaseType;
+//	}
+//
+//	public void setApplyType(String applyType) {
+//		this.applyType = applyType;
+//	}
+//
+//	public void setUserId(String userId) {
+//		this.userId = userId;
+//	}
+
+	public void setSerialNo(String serialNo) {
+		this.serialNo = serialNo;
+	}
+
+	public void setFlowNo(String flowNo) {
+		this.flowNo = flowNo;
+	}
+
+	public void setObjectNo(String objectNo) {
+		this.objectNo = objectNo;
+	}
+
+	@SuppressWarnings("unchecked")
+	public BizObject queryFlowTask(HttpServletRequest request,
+			Transaction sqlca, JBOTransaction tx, Map<String, Object> fieldMap)
+			throws Exception {
+		if (null == fieldMap) {
+			Map<String, Object> testMap = (Map<String, Object>) MultipartDataUtil
+					.readRequestParam(request, "UTF-8");
+			fieldMap = (Map<String, Object>) testMap.get("fieldMap");
+		}
+		objectNo = fieldMap.get("OBJECTNO") == null ? "" : fieldMap.get(
+				"OBJECTNO").toString();
+		//获取当前登录的用户编号
+		ASUser curUser = new ASUser(request.getSession()
+				.getAttribute("userid").toString());
+		userId = curUser == null ? "" : curUser.getUserID();
+		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 {
+		String sSql = "SELECT O.* FROM O,";
+		sSql += FLOW_OBJECT.CLASS_NAME + " FLOW_OBJECT ";
+		sSql += "WHERE FLOW_OBJECT.OBJECTNO=O.OBJECTNO ";
+		sSql += "AND FLOW_OBJECT.FLOWNO=O.FLOWNO ";
+		sSql += "AND FLOW_OBJECT.PHASENO=O.PHASENO ";
+		sSql += "AND FLOW_OBJECT.PHASETYPE=O.PHASETYPE ";
+		sSql += "AND FLOW_OBJECT.OBJECTNO='" + objectNo + "' ";
+		BizObjectManager bom = JBOFactory
+				.getBizObjectManager(FLOW_TASK.CLASS_NAME);
+
+		sSql = (!StringX.isSpace(this.serialNo)) ? "SERIALNO='" + serialNo
+				+ "'" : sSql;
+		return bom.createQuery(sSql).getSingleResult(false);
+	}
+
+	public BizObject queryFlowTaskByFlowObject(JBOTransaction tx)
+			throws JBOException {
+		BizObjectManager bom = JBOFactory
+				.getBizObjectManager(FLOW_TASK.CLASS_NAME);
+		return bom
+				.createQuery(
+						"SELECT O.* FROM O, "
+								+ FLOW_OBJECT.CLASS_NAME
+								+ " FLOW_OBJECT WHERE FLOW_OBJECT.OBJECTNO=O.OBJECTNO AND FLOW_OBJECT.PHASENO=O.PHASENO AND FLOW_OBJECT.FLOWNO=:FLOWNO AND FLOW_OBJECT.OBJECTNO=:OBJECTNO")
+				.setParameter("FLOWNO", flowNo)
+				.setParameter("OBJECTNO", objectNo).getSingleResult(false);
+	}
+}