Browse Source

Merge remote-tracking branch 'remotes/origin/dev_1.0.0' into release_1.0.0

xiatian 2 years ago
parent
commit
cec0015544

+ 5 - 3
src/main/java/cn/com/qmth/mps/service/impl/PaperServiceImpl.java

@@ -238,13 +238,15 @@ public class PaperServiceImpl extends ServiceImpl<PaperDao, PaperEntity> impleme
 						}
 						}
 						for (PaperVo vo : dataList) {
 						for (PaperVo vo : dataList) {
 							vo.setGroupCount(countMap.get(vo.getId()));
 							vo.setGroupCount(countMap.get(vo.getId()));
-							if(vo.getGroupCount()==null) {
-								vo.setGroupCount(0);
-							}
 						}
 						}
 					}
 					}
 				}
 				}
 			}.setDataForBatch(iPage.getRecords(), 20);
 			}.setDataForBatch(iPage.getRecords(), 20);
+			for (PaperVo vo : iPage.getRecords()) {
+				if(vo.getGroupCount()==null) {
+					vo.setGroupCount(0);
+				}
+			}
 		}
 		}
 		return PageUtil.of(iPage);
 		return PageUtil.of(iPage);
 	}
 	}