From 1e51e9e4795171aeae359ede63945dbee84891a6 Mon Sep 17 00:00:00 2001
From: luojing <13968186856@139.com>
Date: Tue, 30 Jun 2020 16:59:21 +0800
Subject: [PATCH] =?UTF-8?q?teamwork=E8=BD=AC=E4=B8=BAcustom=E5=BA=94?=
 =?UTF-8?q?=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../control/jaxrs/task/ActionListMyTaskWithTaskList.java  | 8 ++++----
 .../control/jaxrs/task/ActionListWithTaskList.java        | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/task/ActionListMyTaskWithTaskList.java b/o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/task/ActionListMyTaskWithTaskList.java
index 95483103cc..fd4a0ce43f 100644
--- a/o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/task/ActionListMyTaskWithTaskList.java
+++ b/o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/task/ActionListMyTaskWithTaskList.java
@@ -48,14 +48,14 @@ public class ActionListMyTaskWithTaskList extends BaseAction {
 		}
 		
 		if( Boolean.TRUE.equals( check ) ){
-			cacheKey = ApplicationCache.concreteCacheKey( "ActionListMyTaskWithTaskList", taskListId );
+			/*cacheKey = ApplicationCache.concreteCacheKey( "ActionListMyTaskWithTaskList", taskListId );
 			element = taskCache.get( cacheKey );
 			
 			if ((null != element) && (null != element.getObjectValue())) {
 				resultObject = (ResultObject) element.getObjectValue();
 				result.setCount( resultObject.getTotal() );
 				result.setData( resultObject.getWos() );
-			} else {
+			} else {*/
 				Business business = null;
 				try (EntityManagerContainer bc = EntityManagerContainerFactory.instance().create()) {
 					business = new Business(bc);
@@ -109,7 +109,7 @@ public class ActionListMyTaskWithTaskList extends BaseAction {
 					}
 					
 					resultObject = new ResultObject( total, wos );
-					taskCache.put(new Element( cacheKey, resultObject ));
+					//taskCache.put(new Element( cacheKey, resultObject ));
 					
 					result.setCount( resultObject.getTotal() );
 					result.setData( resultObject.getWos() );
@@ -119,7 +119,7 @@ public class ActionListMyTaskWithTaskList extends BaseAction {
 					result.error(e);
 					logger.error(e, effectivePerson, request, null);
 				}
-			}		
+			//}		
 		}
 		return result;
 	}
diff --git a/o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/task/ActionListWithTaskList.java b/o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/task/ActionListWithTaskList.java
index eaae857ab5..9b5372820d 100644
--- a/o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/task/ActionListWithTaskList.java
+++ b/o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/task/ActionListWithTaskList.java
@@ -47,14 +47,14 @@ public class ActionListWithTaskList extends BaseAction {
 		}
 		
 		if( Boolean.TRUE.equals( check ) ){
-			cacheKey = ApplicationCache.concreteCacheKey( "ActionListWithTaskList", taskListId );
+			/*cacheKey = ApplicationCache.concreteCacheKey( "ActionListWithTaskList", taskListId );
 			element = taskCache.get( cacheKey );
 			
 			if ((null != element) && (null != element.getObjectValue())) {
 				resultObject = (ResultObject) element.getObjectValue();
 				result.setCount( resultObject.getTotal() );
 				result.setData( resultObject.getWos() );
-			} else {
+			} else {*/
 				Business business = null;
 				try (EntityManagerContainer bc = EntityManagerContainerFactory.instance().create()) {
 					business = new Business(bc);
@@ -109,7 +109,7 @@ public class ActionListWithTaskList extends BaseAction {
 						}
 					}					
 					resultObject = new ResultObject( total, wos );
-					taskCache.put(new Element( cacheKey, resultObject ));
+					//taskCache.put(new Element( cacheKey, resultObject ));
 					
 					result.setCount( resultObject.getTotal() );
 					result.setData( resultObject.getWos() );
@@ -119,7 +119,7 @@ public class ActionListWithTaskList extends BaseAction {
 					result.error(e);
 					logger.error(e, effectivePerson, request, null);
 				}
-			}		
+			//}		
 		}
 		return result;
 	}
-- 
GitLab