Merge branch '内容管理缓存问题修改' into 'develop'

内容管理缓存问题修改

See merge request o2oa/o2oa!847

o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/view/ActionListAll.java

@@ -45,11 +45,11 @@ public class ActionListAll extends BaseAction {
 				}
 				//如果有权限，继续操作
 				ViewFactory viewFactory  = business.getViewFactory();
-				List<String> ids = viewFactory.listAll();//获取所有视图列表
-				List<View> viewList = emc.list( View.class, ids );//查询ID IN ids 的所有视图信息列表
+				List<String> ids = viewFactory.listAll();
+				List<View> viewList = emc.list( View.class, ids );
 
 				if( viewList != null && !viewList.isEmpty() ){
-					wraps = Wo.copier.copy( viewList );//将所有查询出来的有状态的对象转换为可以输出的过滤过属性的对象
+					wraps = Wo.copier.copy( viewList );
 					SortTools.desc( wraps, "sequence" );
 
 					for( Wo wo :  wraps ){
@@ -58,8 +58,9 @@ public class ActionListAll extends BaseAction {
 							wo.setFormName( formServiceAdv.getNameWithId( wo.getFormId() ) );
 						}
 					}
+					CacheManager.put(cacheCategory, cacheKey, wraps );
 				}
-				CacheManager.put(cacheCategory, cacheKey, wraps );
+
 				result.setData(wraps);
 			} catch (Throwable th) {
 				th.printStackTrace();

o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/view/ActionListByCategory.java

@@ -45,11 +45,11 @@ public class ActionListByCategory extends BaseAction {
 				}
 				//如果有权限，继续操作
 				ViewFactory viewFactory  = business.getViewFactory();
-				List<String> ids = viewFactory.listByCategoryId( categoryId );//获取指定应用的所有视图列表
-				List<View> viewList = emc.list( View.class, ids );//查询ID IN ids 的所有视图信息列表
+				List<String> ids = viewFactory.listByCategoryId( categoryId );
+				List<View> viewList = emc.list( View.class, ids );
 
 				if( viewList != null && !viewList.isEmpty() ){
-					wraps = Wo.copier.copy( viewList );//将所有查询出来的有状态的对象转换为可以输出的过滤过属性的对象
+					wraps = Wo.copier.copy( viewList );
 					SortTools.desc( wraps, "sequence" );
 
 					for( Wo wo :  wraps ){
@@ -58,9 +58,9 @@ public class ActionListByCategory extends BaseAction {
 							wo.setFormName( formServiceAdv.getNameWithId( wo.getFormId() ) );
 						}
 					}
+					CacheManager.put(cacheCategory, cacheKey, wraps );
 				}
 
-				CacheManager.put(cacheCategory, cacheKey, wraps );
 				result.setData(wraps);
 			} catch (Throwable th) {
 				th.printStackTrace();

o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/view/ActionListByForm.java

@@ -45,24 +45,22 @@ public class ActionListByForm extends BaseAction {
 				}
 				//如果有权限，继续操作
 				ViewFactory viewFactory  = business.getViewFactory();
-				List<String> ids = viewFactory.listByFormId( formId );//获取指定表单ID的所有视图列表
-				List<View> viewList = emc.list( View.class, ids );//查询ID IN ids 的所有视图信息列表
+				List<String> ids = viewFactory.listByFormId( formId );
+				List<View> viewList = emc.list( View.class, ids );
 
 				if( viewList != null && !viewList.isEmpty() ){
-					wraps = Wo.copier.copy( viewList );//将所有查询出来的有状态的对象转换为可以输出的过滤过属性的对象
+					wraps = Wo.copier.copy( viewList );
 					SortTools.desc( wraps, "sequence" );
-
 					String formName = formServiceAdv.getNameWithId( formId );
-
 					for( Wo wo :  wraps ){
 						//根据FormId补充FormName
 						if(StringUtils.isNotEmpty( wo.getFormId() )) {
 							wo.setFormName( formName );
 						}
 					}
+					CacheManager.put(cacheCategory, cacheKey, wraps );
 				}
 
-				CacheManager.put(cacheCategory, cacheKey, wraps );
 				result.setData(wraps);
 			} catch (Throwable th) {
 				th.printStackTrace();