| 
														
															@@ -17,6 +17,7 @@ import com.keao.edu.user.page.StudentApplyQueryInfo; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 import com.keao.edu.user.service.OrganizationService; 
														 | 
														
														 | 
														
															 import com.keao.edu.user.service.OrganizationService; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 import com.keao.edu.user.service.StudentService; 
														 | 
														
														 | 
														
															 import com.keao.edu.user.service.StudentService; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 import com.keao.edu.util.collection.MapUtil; 
														 | 
														
														 | 
														
															 import com.keao.edu.util.collection.MapUtil; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+import com.keao.edu.util.string.ValueUtil; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 import org.apache.commons.lang3.StringUtils; 
														 | 
														
														 | 
														
															 import org.apache.commons.lang3.StringUtils; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 import org.springframework.beans.factory.annotation.Autowired; 
														 | 
														
														 | 
														
															 import org.springframework.beans.factory.annotation.Autowired; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 import org.springframework.stereotype.Service; 
														 | 
														
														 | 
														
															 import org.springframework.stereotype.Service; 
														 | 
													
												
											
										
											
												
													
														 | 
														
															@@ -184,8 +185,14 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             List<Integer> studentIds = dataList.stream().map(e -> e.getUserId()).collect(Collectors.toList()); 
														 | 
														
														 | 
														
															             List<Integer> studentIds = dataList.stream().map(e -> e.getUserId()).collect(Collectors.toList()); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             //获取考试次数 
														 | 
														
														 | 
														
															             //获取考试次数 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             Map<Integer, Integer> examNumMap = MapUtil.convertMybatisMap(studentExamResultDao.countExamNum(studentIds, queryInfo.getTenantId()),Integer.class,Integer.class); 
														 | 
														
														 | 
														
															             Map<Integer, Integer> examNumMap = MapUtil.convertMybatisMap(studentExamResultDao.countExamNum(studentIds, queryInfo.getTenantId()),Integer.class,Integer.class); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+ 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             dataList.forEach(e -> { 
														 | 
														
														 | 
														
															             dataList.forEach(e -> { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                 e.setExamNum(examNumMap.get(e.getUserId())); 
														 | 
														
														 | 
														
															                 e.setExamNum(examNumMap.get(e.getUserId())); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+                if(organId != null){ 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+                    if(e.getOrganId() != organId){ 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+                        e.getSysUser().setPhone(ValueUtil.fuzzyMobile(e.getSysUser().getPhone())); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+                    } 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+                } 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             }); 
														 | 
														
														 | 
														
															             }); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         } 
														 | 
														
														 | 
														
															         } 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         if (count == 0) { 
														 | 
														
														 | 
														
															         if (count == 0) { 
														 |