|
@@ -2988,13 +2988,17 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
|
|
|
MapUtil.populateMap(params, queryInfo);
|
|
|
params.put("groupType",queryInfo.getGroupType().getCode());
|
|
|
|
|
|
+ List<ClassGroupTeachersDto> dataList = null;
|
|
|
+ int count = classGroupDao.countClassGroup(params);
|
|
|
+
|
|
|
if(Objects.nonNull(queryInfo.getLessThenThreeHighOnline())){
|
|
|
List<Long> lessThenThreeClassGroupIds = classGroupStudentMapperDao.getLessThenThreeClassGroupIds(queryInfo.getOrganIdList());
|
|
|
params.put("classGroupIds", lessThenThreeClassGroupIds);
|
|
|
+ if(CollectionUtils.isEmpty(lessThenThreeClassGroupIds)){
|
|
|
+ count=0;
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
- List<ClassGroupTeachersDto> dataList = null;
|
|
|
- int count = classGroupDao.countClassGroup(params);
|
|
|
if (count > 0) {
|
|
|
pageInfo.setTotal(count);
|
|
|
params.put("offset", pageInfo.getOffset());
|