|
|
@ -15,6 +15,7 @@ import org.springframework.beans.factory.annotation.Value; |
|
|
|
import org.springframework.security.crypto.password.PasswordEncoder; |
|
|
|
import org.springframework.security.crypto.password.PasswordEncoder; |
|
|
|
import org.springframework.stereotype.Component; |
|
|
|
import org.springframework.stereotype.Component; |
|
|
|
import org.springframework.stereotype.Service; |
|
|
|
import org.springframework.stereotype.Service; |
|
|
|
|
|
|
|
import org.springframework.util.StringUtils; |
|
|
|
|
|
|
|
|
|
|
|
import java.sql.Connection; |
|
|
|
import java.sql.Connection; |
|
|
|
import java.sql.DriverManager; |
|
|
|
import java.sql.DriverManager; |
|
|
@ -67,7 +68,7 @@ public class UmsStudentManageServiceImpl extends ServiceImpl<UmsStudentManageMap |
|
|
|
result.put("currentPage", umsStudentPageQueryDTO.getPage()); |
|
|
|
result.put("currentPage", umsStudentPageQueryDTO.getPage()); |
|
|
|
|
|
|
|
|
|
|
|
//对集合里的数据进行模糊和分页查询
|
|
|
|
//对集合里的数据进行模糊和分页查询
|
|
|
|
if (umsStudentPageQueryDTO.getName() != null){ |
|
|
|
if (StringUtils.hasText(umsStudentPageQueryDTO.getName())){ |
|
|
|
List<UmsStudentManage> umsStudentManageList = umsStudentManages.stream() |
|
|
|
List<UmsStudentManage> umsStudentManageList = umsStudentManages.stream() |
|
|
|
.filter(studentManage -> |
|
|
|
.filter(studentManage -> |
|
|
|
studentManage != null && |
|
|
|
studentManage != null && |
|
|
@ -77,7 +78,7 @@ public class UmsStudentManageServiceImpl extends ServiceImpl<UmsStudentManageMap |
|
|
|
.limit(umsStudentPageQueryDTO.getPageSize()) |
|
|
|
.limit(umsStudentPageQueryDTO.getPageSize()) |
|
|
|
.collect(Collectors.toList()); |
|
|
|
.collect(Collectors.toList()); |
|
|
|
result.put("Records", umsStudentManageList); |
|
|
|
result.put("Records", umsStudentManageList); |
|
|
|
}else if (umsStudentPageQueryDTO.getNumber() != null){ |
|
|
|
}else if (StringUtils.hasText(umsStudentPageQueryDTO.getNumber())){ |
|
|
|
List<UmsStudentManage> umsStudentManageList = umsStudentManages.stream() |
|
|
|
List<UmsStudentManage> umsStudentManageList = umsStudentManages.stream() |
|
|
|
.filter(studentManage -> |
|
|
|
.filter(studentManage -> |
|
|
|
studentManage != null && |
|
|
|
studentManage != null && |
|
|
|