Index: forgon-core/src/main/java/com/forgon/workflow/service/WorkFlowApprovalTaskManagerImpl.java
===================================================================
diff -u -r22046 -r22048
--- forgon-core/src/main/java/com/forgon/workflow/service/WorkFlowApprovalTaskManagerImpl.java	(.../WorkFlowApprovalTaskManagerImpl.java)	(revision 22046)
+++ forgon-core/src/main/java/com/forgon/workflow/service/WorkFlowApprovalTaskManagerImpl.java	(.../WorkFlowApprovalTaskManagerImpl.java)	(revision 22048)
@@ -515,7 +515,7 @@
 			//获取上一个节点
 			NodeDefinition lastNodeDefinition=nodeDefinitionManager.getLastNodeDefinition(workFlowApprovalTaskVO.getNodeDefinitionId());	
 			workFlowApprovalTask.setHandleOpinion(workFlowApprovalTaskVO.getHandleOpinion());
-			workFlowApprovalTask.setHandlerId(workFlowApprovalTaskVO.getUserId());
+			workFlowApprovalTask.setHandlerId(workFlowApprovalTaskVO.getHandlerId());
 			workFlowApprovalTask.setHandler(workFlowApprovalTaskVO.getHandler());
 			workFlowApprovalTask.setHandleTime(new Date());
 			workFlowApprovalTask.setStatus(1);
Index: ssts-web/src/main/webapp/systemmanage/workFlow/workFlowApprovalTaskForm.js
===================================================================
diff -u -r22046 -r22048
--- ssts-web/src/main/webapp/systemmanage/workFlow/workFlowApprovalTaskForm.js	(.../workFlowApprovalTaskForm.js)	(revision 22046)
+++ ssts-web/src/main/webapp/systemmanage/workFlow/workFlowApprovalTaskForm.js	(.../workFlowApprovalTaskForm.js)	(revision 22048)
@@ -327,7 +327,7 @@
 	}
 	function RollBack(){
 		rollBackformObj= Ext4.create('Ext4.form.Panel', {
-			//id:'rollBackformObj',
+			id:'rollBackformObj',
 			layout : 'column',
 			frame : true,
 			border : 0,
@@ -438,7 +438,7 @@
 			//id:'passBtn',
 			text : '审核通过',
 			iconCls : 'btn_ext_application_edit',
-			hidden: (allowStore.getAt(0).get('allowNoticeFormMan'))||(!allowStore.getAt(0).get('allowNoticeFormMan')&&nodeDefinition_id==null)?true:false,
+			hidden: allowStore.getAt(0).get('allowNoticeFormMan')||approvalResult==APPROVALRESULT_NOTICEFAIL||(!allowStore.getAt(0).get('allowNoticeFormMan')&&nodeDefinition_id==null)?true:false,
 			handler : function() {
 				Pass();
 			}
@@ -447,7 +447,7 @@
 			//id:'failBtn',
 			text : '审核不通过',
 			iconCls : 'btn_ext_application_edit',
-			hidden:  (allowStore.getAt(0).get('allowNoticeFormMan'))||(!allowStore.getAt(0).get('allowNoticeFormMan')&&!allowStore.getAt(0).get('allowDisagree'))?true:false,
+			hidden:  (allowStore.getAt(0).get('allowNoticeFormMan'))||approvalResult==APPROVALRESULT_NOTICEFAIL||(!allowStore.getAt(0).get('allowNoticeFormMan')&&!allowStore.getAt(0).get('allowDisagree'))?true:false,
 			handler : function() {
 				Fail();
 			}
@@ -456,7 +456,7 @@
 			//id:'rollBackBtn',
 			text : '回退',
 			iconCls : 'btn_ext_application_edit',
-			hidden:(allowStore.getAt(0).get('allowNoticeFormMan'))||(!allowStore.getAt(0).get('allowNoticeFormMan')&&!allowStore.getAt(0).get('allowRollback'))?true:false,
+			hidden:(allowStore.getAt(0).get('allowNoticeFormMan'))||approvalResult==APPROVALRESULT_NOTICEFAIL||(!allowStore.getAt(0).get('allowNoticeFormMan')&&!allowStore.getAt(0).get('allowRollback'))?true:false,
 			handler : function() {
 				RollBack();
 			}