|  | @@ -1839,8 +1839,8 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
 | 
											
												
													
														|  |          params.put("offset", pageInfo.getOffset());
 |  |          params.put("offset", pageInfo.getOffset());
 | 
											
												
													
														|  |          if (queryInfo.getPage() <= pageInfo.getTotalPage()) {
 |  |          if (queryInfo.getPage() <= pageInfo.getTotalPage()) {
 | 
											
												
													
														|  |              RegisterDto registerOrPreMinTime = studentRegistrationDao.getRegisterOrPreMinTime(queryInfo.getMusicGroupId());
 |  |              RegisterDto registerOrPreMinTime = studentRegistrationDao.getRegisterOrPreMinTime(queryInfo.getMusicGroupId());
 | 
											
												
													
														|  | -            Date firstPreTime = registerOrPreMinTime.getMinPerRegisterTime();
 |  | 
 | 
											
												
													
														|  | -            Date firstPayTime = registerOrPreMinTime.getMinPayTime();
 |  | 
 | 
											
												
													
														|  | 
 |  | +            Date firstPreTime = registerOrPreMinTime != null ? registerOrPreMinTime.getMinPerRegisterTime() : null;
 | 
											
												
													
														|  | 
 |  | +            Date firstPayTime = registerOrPreMinTime != null ? registerOrPreMinTime.getMinPayTime() : null;
 | 
											
												
													
														|  |              dataList = studentRegistrationDao.getRegisterOrPreList(params);
 |  |              dataList = studentRegistrationDao.getRegisterOrPreList(params);
 | 
											
												
													
														|  |              for (RegisterDto registerDto : dataList) {
 |  |              for (RegisterDto registerDto : dataList) {
 | 
											
												
													
														|  |                  if (registerDto.getPerRegisterTime() != null) {
 |  |                  if (registerDto.getPerRegisterTime() != null) {
 |