|
@@ -64,18 +64,24 @@ public interface AdminUserMapper extends BaseMapperX<AdminUserDO> {
|
|
|
}
|
|
|
|
|
|
// lsq 查所有学生
|
|
|
- default PageResult<AdminUserDO> selectPage1(UserPageReqVO reqVO, Collection<Long> deptIds) {
|
|
|
- return selectPage(reqVO, new LambdaQueryWrapperX<AdminUserDO>()
|
|
|
- .likeIfPresent(AdminUserDO::getUsername, reqVO.getUsername())
|
|
|
- .likeIfPresent(AdminUserDO::getMobile, reqVO.getMobile())
|
|
|
- .eqIfPresent(AdminUserDO::getStatus, reqVO.getStatus())
|
|
|
- .betweenIfPresent(AdminUserDO::getCreateTime, reqVO.getCreateTime())
|
|
|
- .inIfPresent(AdminUserDO::getDeptId, deptIds)
|
|
|
- // 添加子查询条件,查找有教师权限的人
|
|
|
- .inSql(AdminUserDO::getId,
|
|
|
- "SELECT id FROM system_users WHERE user_type IN (1,2)")
|
|
|
- .orderByDesc(AdminUserDO::getId));
|
|
|
- }
|
|
|
+ default PageResult<AdminUserDO> selectPage1(UserPageReqVO reqVO, Collection<Long> deptIds) {
|
|
|
+ // 查询用户数据
|
|
|
+ PageResult<AdminUserDO> result = selectPage(reqVO, new LambdaQueryWrapperX<AdminUserDO>()
|
|
|
+ .likeIfPresent(AdminUserDO::getUsername, reqVO.getUsername())
|
|
|
+ .likeIfPresent(AdminUserDO::getMobile, reqVO.getMobile())
|
|
|
+ .eqIfPresent(AdminUserDO::getStatus, reqVO.getStatus())
|
|
|
+ .betweenIfPresent(AdminUserDO::getCreateTime, reqVO.getCreateTime())
|
|
|
+ .inIfPresent(AdminUserDO::getDeptId, deptIds)
|
|
|
+ .inSql(AdminUserDO::getId, "SELECT id FROM system_users WHERE user_type IN (1,2)")
|
|
|
+ .orderByDesc(AdminUserDO::getId));
|
|
|
+
|
|
|
+ // 遍历结果集,设置 photoIsExist
|
|
|
+ for (AdminUserDO user : result.getList()) {
|
|
|
+ user.setPhotoIsExist(Long.valueOf(user.getPhotoUrl() != null && !user.getPhotoUrl().isEmpty() ? 1 : 0));
|
|
|
+ }
|
|
|
+
|
|
|
+ return result;
|
|
|
+ }
|
|
|
|
|
|
// lsq 查工作间下的老师 3老师
|
|
|
default PageResult<AdminUserDO> selectDeptTeacherPage(UserPageReqVO reqVO, Collection<Long> deptIds) {
|
|
@@ -97,20 +103,29 @@ public interface AdminUserMapper extends BaseMapperX<AdminUserDO> {
|
|
|
|
|
|
// lsq 查工作间下的学生 1在校生,2毕业生
|
|
|
default PageResult<AdminUserDO> selectDeptStudentPage(UserPageReqVO reqVO, Collection<Long> deptIds) {
|
|
|
- Long loginID = SecurityFrameworkUtils.getLoginUserId(); //
|
|
|
+ Long loginID = SecurityFrameworkUtils.getLoginUserId();
|
|
|
System.out.println(loginID);
|
|
|
- return selectPage(reqVO, new LambdaQueryWrapperX<AdminUserDO>()
|
|
|
+
|
|
|
+ // 查询用户数据
|
|
|
+ PageResult<AdminUserDO> result = selectPage(reqVO, new LambdaQueryWrapperX<AdminUserDO>()
|
|
|
.likeIfPresent(AdminUserDO::getUsername, reqVO.getUsername())
|
|
|
.likeIfPresent(AdminUserDO::getMobile, reqVO.getMobile())
|
|
|
.eqIfPresent(AdminUserDO::getStatus, reqVO.getStatus())
|
|
|
.betweenIfPresent(AdminUserDO::getCreateTime, reqVO.getCreateTime())
|
|
|
.inIfPresent(AdminUserDO::getDeptId, deptIds)
|
|
|
- .inSql(AdminUserDO::getId,
|
|
|
- "SELECT id FROM system_users WHERE user_type IN (1,2)")
|
|
|
+ .inSql(AdminUserDO::getId, "SELECT id FROM system_users WHERE user_type IN (1,2)")
|
|
|
.inSql(AdminUserDO::getDeptId, String.format("SELECT dept_id FROM system_users WHERE id = %d", loginID))
|
|
|
.orderByDesc(AdminUserDO::getId));
|
|
|
+
|
|
|
+ // 遍历结果集,设置 photoIsExist
|
|
|
+ for (AdminUserDO user : result.getList()) {
|
|
|
+ user.setPhotoIsExist(Long.valueOf(user.getPhotoUrl() != null && !user.getPhotoUrl().isEmpty() ? 1 : 0));
|
|
|
+ }
|
|
|
+
|
|
|
+ return result;
|
|
|
}
|
|
|
|
|
|
+
|
|
|
// lsq 查所有毕业学生
|
|
|
default PageResult<AdminUserDO> selectGraduateStudentPage(UserPageReqVO reqVO, Collection<Long> deptIds) {
|
|
|
return selectPage(reqVO, new LambdaQueryWrapperX<AdminUserDO>()
|