11.16

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/user/AdminUserMapper.java

@@ -9,6 +9,7 @@ import cn.iocoder.yudao.framework.security.core.LoginUser;
 import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
 import cn.iocoder.yudao.module.system.controller.admin.user.vo.user.UserPageReqVO;
 import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO;
+import cn.iocoder.yudao.module.system.dal.dataobject.userAchievement.UserAchievementDO;
 import cn.iocoder.yudao.module.system.service.permission.PermissionService;
 import cn.iocoder.yudao.module.system.service.user.AdminUserService;
 import com.baomidou.mybatisplus.annotation.DbType;
@@ -95,30 +96,33 @@ public interface AdminUserMapper extends BaseMapperX<AdminUserDO> {
     // 会根据登录 查在校学生
     default PageResult<AdminUserDO> selectPage1(UserPageReqVO reqVO, Collection<Long> deptIds,Set<Long>roleIds,Long loginId) {
 
-        LambdaQueryWrapperX<AdminUserDO> queryWrapperX =new LambdaQueryWrapperX<AdminUserDO>();
+        MPJLambdaWrapper<AdminUserDO> queryWrapperX =new MPJLambdaWrapper<AdminUserDO>();
         queryWrapperX
-                .likeIfPresent(AdminUserDO::getUsername, reqVO.getUsername())
-                .likeIfPresent(AdminUserDO::getEmail,reqVO.getEmail())
-                .likeIfPresent(AdminUserDO::getMobile, reqVO.getMobile())
-                .likeIfPresent(AdminUserDO::getUserNumber,reqVO.getUserNumber())//学号查询
-                .likeIfPresent(AdminUserDO::getNickname, reqVO.getNickname())//昵称查询
-                .eqIfPresent(AdminUserDO::getUserType,reqVO.getUserType())//类型查询
-                .likeIfPresent(AdminUserDO::getGrade, reqVO.getGrade())//班级查询
-                .eqIfPresent(AdminUserDO::getSupervisorId,reqVO.getSupervisorId())//导师查询
-                .eqIfPresent(AdminUserDO::getStatus, reqVO.getStatus())
-                .betweenIfPresent(AdminUserDO::getCreateTime, reqVO.getCreateTime())
-                .inIfPresent(AdminUserDO::getDeptId, deptIds)
+//                .between(reqVO.getCreateTime() != null,AdminUserDO::getCreateTime, reqVO.getCreateTime())
+                .leftJoin(UserAchievementDO.class,UserAchievementDO::getUserId,AdminUserDO::getId)
+                .likeIfExists(AdminUserDO::getUsername, reqVO.getUsername())
+                .likeIfExists(AdminUserDO::getEmail,reqVO.getEmail())
+                .likeIfExists(AdminUserDO::getMobile, reqVO.getMobile())
+                .likeIfExists(AdminUserDO::getUserNumber,reqVO.getUserNumber())//学号查询
+                .likeIfExists(AdminUserDO::getNickname, reqVO.getNickname())//昵称查询
+                .eqIfExists(AdminUserDO::getUserType,reqVO.getUserType())//类型查询
+                .likeIfExists(AdminUserDO::getGrade, reqVO.getGrade())//班级查询
+                .eqIfExists(AdminUserDO::getSupervisorId,reqVO.getSupervisorId())//导师查询
+                .eqIfExists(AdminUserDO::getStatus, reqVO.getStatus())
+                .eqIfExists(UserAchievementDO::getIsGraduate, reqVO.getIsGraduate())
+                .in(deptIds!=null && !deptIds.isEmpty(),AdminUserDO::getDeptId, deptIds)
+
                 .orderByDesc(AdminUserDO::getId);
 
 //        if ()
 
         if (roleIds.contains(113L)){//如果是教师,只找导师是登录的
-            queryWrapperX.eqIfPresent(AdminUserDO::getSupervisorId,loginId)
-                          .eqIfPresent(AdminUserDO::getUserType,1);
+            queryWrapperX.eqIfExists(AdminUserDO::getSupervisorId,loginId)
+                          .eqIfExists(AdminUserDO::getUserType,1);
         } else if (roleIds.contains(114L)) {//学院
-            queryWrapperX.eqIfPresent(AdminUserDO::getUserType,1);
+            queryWrapperX.eqIfExists(AdminUserDO::getUserType,1);
         }else if (roleIds.contains(1L)){//管理员
-            queryWrapperX.inIfPresent(AdminUserDO::getUserType,1,2);
+            queryWrapperX.in(AdminUserDO::getDeptId, 1,2);
         }
         PageResult<AdminUserDO> result = selectPage(reqVO,queryWrapperX);
 

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java

@@ -365,7 +365,7 @@ public class AdminUserServiceImpl implements AdminUserService {
         // 遍历结果集，设置 photoIsExist
         result.getList().stream().forEach(user -> {
             user.setPhotoIsExist(Long.valueOf(user.getPhotoUrl() != null && !user.getPhotoUrl().isEmpty() ? 1 : 0));
-            user.setIsGraduate(vilidateIsGraduate(user));
+//            user.setIsGraduate(vilidateIsGraduate(user));
             if (user.getDeptId()==null||user.getDeptId()==0L){
                 user.setDeptName("测绘学院");
             }
@@ -380,17 +380,17 @@ public class AdminUserServiceImpl implements AdminUserService {
                 }
             }
         });
-        if (reqVO.getIsGraduate() != null) {//搜索毕业状态
-            result.setList(result.getList().stream()
-                    .filter(user -> reqVO.getIsGraduate().equals(user.getIsGraduate()))
-                    .collect(Collectors.toList()));
-            // 重新计算分页信息
-        }
-        if (reqVO.getPhotoIsExist() != null) {//搜索人脸导入
-            result.setList(result.getList().stream()
-                    .filter(user -> reqVO.getPhotoIsExist().equals(user.getPhotoIsExist()))
-                    .collect(Collectors.toList()));
-        }
+//        if (reqVO.getIsGraduate() != null) {//搜索毕业状态
+//            result.setList(result.getList().stream()
+//                    .filter(user -> reqVO.getIsGraduate().equals(user.getIsGraduate()))
+//                    .collect(Collectors.toList()));
+//            // 重新计算分页信息
+//        }
+//        if (reqVO.getPhotoIsExist() != null) {//搜索人脸导入
+//            result.setList(result.getList().stream()
+//                    .filter(user -> reqVO.getPhotoIsExist().equals(user.getPhotoIsExist()))
+//                    .collect(Collectors.toList()));
+//        }
         return result;
     }
 

yudao-module-system/yudao-module-system-biz/src/main/resources/Mapper/AdminUserMapper/AdminUserMapper.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.iocoder.yudao.module.system.dal.mysql.user.AdminUserMapper">
+    <select id="selectPage1" resultType="cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO">
+
+    </select>
+</mapper>