Просмотр исходного кода

[内容管理]修复在某些情况下,分页数据排序不正确引起,分页功能不正常的问题

o2lee 5 лет назад
Родитель
Сommit
a2e21b5053

+ 2 - 1
o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/categoryinfo/ActionListWhatICanPublish.java

@@ -146,6 +146,7 @@ public class ActionListWhatICanPublish extends BaseAction {
 						}
 						SortTools.asc(wos, "categorySeq");
 						CacheManager.put(cacheCategory, cacheKey, wos);
+						result.setData(wos);
 					} catch (Exception e) {
 						check = false;
 						Exception exception = new ExceptionCategoryInfoProcess(e, "将查询出来的分类信息对象转换为可输出的数据信息时发生异常。");
@@ -155,7 +156,7 @@ public class ActionListWhatICanPublish extends BaseAction {
 				}
 			}
 		}
-		result.setData(wos);
+
 		return result;
 	}
 	

+ 8 - 3
o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/service/DocumentQueryService.java

@@ -512,11 +512,16 @@ public class DocumentQueryService {
 	private List<Document> listDocumentsWithReview( List<Review> reviewList ) throws Exception {
 		List<String> docIds = new ArrayList<>();
 		if( ListTools.isNotEmpty( reviewList )) {
-			for( Review review : reviewList ) {
-				docIds.add( review.getDocId() );
+			try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create() ) {
+				for( Review review : reviewList ) {
+					docIds.add( review.getDocId() );
+				}
+				return emc.list( Document.class, true, docIds );
+			} catch ( Exception e ) {
+				throw e;
 			}
 		}
-		return list( docIds );
+		return null;
 	}
 
 	/**