From 688c5ee2124f2e29a99304dd84e5e1855dadf1a2 Mon Sep 17 00:00:00 2001
From: tangfutang <tangft@tenwa.com.cn>
Date: Tue, 27 Oct 2020 15:50:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2=E4=BB=A3?=
 =?UTF-8?q?=E5=8A=9E=E5=88=A4=E6=96=AD=E6=9D=A1=E4=BB=B6=E5=92=8C=E8=A7=92?=
 =?UTF-8?q?=E8=89=B2=E7=AE=A1=E7=90=86=E9=A1=B5=E9=9D=A2=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WebContent/AppConfig/RoleManage/RoleList.jsp              | 8 ++++----
 .../Tenwa/Lease/Flow/Comm/LBDebitCard/DebitCardInfo.jsp   | 6 +++---
 src/com/amarsoft/dict/als/manage/ColRelativeInfo.java     | 2 +-
 src_tenwa/com/tenwa/lease/app/quartzmession/TaskPool.java | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/WebContent/AppConfig/RoleManage/RoleList.jsp b/WebContent/AppConfig/RoleManage/RoleList.jsp
index f426f162d..ea37dbf85 100644
--- a/WebContent/AppConfig/RoleManage/RoleList.jsp
+++ b/WebContent/AppConfig/RoleManage/RoleList.jsp
@@ -24,10 +24,10 @@
 		{(CurUser.hasRole("099")||CurUser.hasRole("299")?"true":"false"),"","Button","新增角色","新增一种角色","newRecord()","","","","btn_icon_add"},
 		{"true","","Button","详情","查看角色情况","viewAndEdit()","","","","btn_icon_detail"},
 		{"true","","Button","角色下用户","查看该角色所有用户","viewUser()","","","","btn_icon_role"},
-		{(CurUser.hasRole("099")||CurUser.hasRole("299")?"true":"false"),"","Button","主菜单授权","给角色授权主菜单","my_AddMenu()","","","","btn_icon_menu"},
-		{(CurUser.hasRole("099")||CurUser.hasRole("299")?"true":"false"),"","Button","多角色菜单授权","给多个角色授权主菜单","much_AddMenu()","","","","btn_icon_roles"},
-		{(CurUser.hasRole("099")||CurUser.hasRole("299")?"true":"false"),"","Button","变更生效","同步缓存中数据使数据库变更生效","reloadCacheRole()","","","","btn_icon_valid"},
-		{(CurUser.hasRole("099")||CurUser.hasRole("299")?"true":"false"),"","Button","保存","保存","as_save(0)","","","","btn_icon_save"}
+		{"true","","Button","主菜单授权","给角色授权主菜单","my_AddMenu()","","","","btn_icon_menu"},
+		{"true","","Button","多角色菜单授权","给多个角色授权主菜单","much_AddMenu()","","","","btn_icon_roles"},
+		{"true","","Button","变更生效","同步缓存中数据使数据库变更生效","reloadCacheRole()","","","","btn_icon_valid"},
+		{"true","","Button","保存","保存","as_save(0)","","","","btn_icon_save"}
 	};
 %><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
 <script type="text/javascript">
diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/DebitCardInfo.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/DebitCardInfo.jsp
index 5c86f377a..a213c5511 100644
--- a/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/DebitCardInfo.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/DebitCardInfo.jsp
@@ -18,7 +18,7 @@
     String ishistory=CurPage.getParameter("IsHistory");
     String FlowUnid=CurPage.getParameter("FlowUnid");
     String flowName=CurPage.getParameter("FlowName");
-    String ccc=CurPage.getParameter("FlowNo");
+    String flowNo=CurPage.getParameter("FlowNo");
     String CustomerType=CurPage.getParameter("CustomerType");
     String ApplyType=CurPage.getParameter("ApplyType");
     String PhaseNo=CurPage.getParameter("PhaseNo");
@@ -72,8 +72,8 @@
 				return;
 	    	}
 			sReturn = sReturn.split("@");
-			var bankCode = getItemValueByName(0, 0, "bank_code");
-			if(<%=flowNo%>=="BusinessApplyFlow"||(bankCode!=null&&bankCode!="")){
+			var bankCode = getItemValue(0, 0, "bank_code");
+			if("<%=flowNo%>"=="BusinessApplyFlow"||(bankCode!=null&&bankCode!="")){
 				setItemValue(0,0,'bank_code',sReturn[0]);
 			}
 			setItemValue(0,0,'bank_type',sReturn[1]);
diff --git a/src/com/amarsoft/dict/als/manage/ColRelativeInfo.java b/src/com/amarsoft/dict/als/manage/ColRelativeInfo.java
index cd894caa5..188880751 100644
--- a/src/com/amarsoft/dict/als/manage/ColRelativeInfo.java
+++ b/src/com/amarsoft/dict/als/manage/ColRelativeInfo.java
@@ -285,7 +285,7 @@ public class ColRelativeInfo {
 	public static String getTaskNumber(String UserID, String RoleID) throws Exception {
 		JBOTransaction tx = JBOFactory.createJBOTransaction();
 		Transaction tran = Transaction.createTransaction(tx);
-		String result = tran.getString(new SqlObject("select count(1) from user_task_data where userid = '" + UserID + "' and roleid = '" + RoleID + "' and status = 'approve_status01' group by userid,roleid"));
+		String result = tran.getString(new SqlObject("select count(1) from user_task_data utd,flow_task ft where utd.taskno=ft.serialno and ft.endtime is null and utd.userid = '" + UserID + "' and utd.roleid = '" + RoleID + "' and utd.status = 'approve_status01' group by utd.userid,utd.roleid"));
 		tx.commit();
 		if(tran != null){
 			tran.disConnect();
diff --git a/src_tenwa/com/tenwa/lease/app/quartzmession/TaskPool.java b/src_tenwa/com/tenwa/lease/app/quartzmession/TaskPool.java
index 8bda87f50..6e63deb60 100644
--- a/src_tenwa/com/tenwa/lease/app/quartzmession/TaskPool.java
+++ b/src_tenwa/com/tenwa/lease/app/quartzmession/TaskPool.java
@@ -80,7 +80,7 @@ public class TaskPool implements Job {
 				while(rsUser.next()) {
 					double taskWeight = rsUser.getInt("task_weight");//获得权重
 					double taskNumber = rsUser.getInt("tasknumber");;//获得已收到待办
-					String cou = tran.getString(new SqlObject("select count(1) from user_task_data where userid = '" + rsUser.getString("userid") + "' and roleid = '" + roleId + "' and status = 'approve_status01' group by userid,roleid"));
+					String cou = tran.getString(new SqlObject("select count(1) from user_task_data utd,flow_task ft where utd.taskno=ft.serialno and ft.endtime is null and utd.userid = '" + rsUser.getString("userid") + "' and utd.roleid = '" + roleId + "' and utd.status = 'approve_status01' group by utd.userid,utd.roleid"));
 					if(cou == null) {
 						cou = "0";
 					}