From 3212080969a1da3cce5f0269837058fff68255a5 Mon Sep 17 00:00:00 2001
From: tangfutang <3218982385@qq.com>
Date: Tue, 26 Sep 2023 18:30:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=A0=A1=E9=AA=8C=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WebContent/Frame/page/ow/RequiredRuleUpdator.jsp           | 2 +-
 .../Tenwa/Core/FlowInstanceTrack/FlowInstanceTrack.jsp     | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/WebContent/Frame/page/ow/RequiredRuleUpdator.jsp b/WebContent/Frame/page/ow/RequiredRuleUpdator.jsp
index 19f55619f..2029af610 100644
--- a/WebContent/Frame/page/ow/RequiredRuleUpdator.jsp
+++ b/WebContent/Frame/page/ow/RequiredRuleUpdator.jsp
@@ -27,6 +27,6 @@ try{
 }catch(Exception e){
 	//e.printStackTrace();2018/07/08 by zhulh 找不到校验文件没啥好大惊小怪的
 	ARE.getLog().error(e.getMessage());
-	out.print("fail:"+ e.toString());
+	//out.print("fail:"+ e.toString());
 }
 %>
\ No newline at end of file
diff --git a/WebContent/Tenwa/Core/FlowInstanceTrack/FlowInstanceTrack.jsp b/WebContent/Tenwa/Core/FlowInstanceTrack/FlowInstanceTrack.jsp
index bc97ee385..e071a6b2a 100644
--- a/WebContent/Tenwa/Core/FlowInstanceTrack/FlowInstanceTrack.jsp
+++ b/WebContent/Tenwa/Core/FlowInstanceTrack/FlowInstanceTrack.jsp
@@ -33,6 +33,7 @@
 <%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=List03;Describe=定义数据对象;]~*/%>
 <%	
 	String soft = CurPage.getParameter("soft");
+	String type = CurPage.getParameter("type");
 	String userId = CurUser.getUserID();
 	ASObjectModel doTemp = new ASObjectModel("FlowInstanceTrack3");
 	doTemp.setDataQueryClass("com.amarsoft.awe.dw.ui.list.FlowMonitorListHtmlGenerator");
@@ -40,7 +41,11 @@
 	String ros = "true";
  	if("业务申请分担".equals(soft)){
  		ros = "false";
- 		doTemp.appendJboWhere("( (O.APPLYTYPE='BusinessApplyApply' and O.PHASENO in ('0030','0040','0050','0051','0052') ) or ( O.flow_name='业务变更流程' and O.PHASENAME='信审专员初审') )");
+ 		if("reexamine".equals(type)){//添加复审数据
+	 		doTemp.appendJboWhere("( (O.APPLYTYPE='BusinessApplyApply' and O.PHASENO in ('0040','0050','0051','0052') ) or ( O.flow_name='业务变更流程' and O.PHASENAME='信审专员初审') )");
+ 		}else{
+	 		doTemp.appendJboWhere("( (O.APPLYTYPE='BusinessApplyApply' and O.PHASENO='0030' ) or ( O.flow_name='业务变更流程' and O.PHASENAME='信审专员初审') )");
+ 		}
  	};
  	if("付款业务分担".equals(soft)){
  		ros = "false";