成果详情修改

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/userAchievement/UserAchievementController.java

@@ -99,31 +99,10 @@ public class UserAchievementController {
     @PreAuthorize("@ss.hasPermission('system:user-achievement:query')")
     public CommonResult<PageResult<UserAchievementRespVO>> getUserAchievementPage(@Valid UserAchievementPageReqVO pageReqVO) {
         PageResult<UserAchievementDO>pageResult = userAchievementService.getUserAchievementPage(pageReqVO);
-
-        System.out.println(pageResult);
-        return success(BeanUtils.toBean(pageResult, UserAchievementRespVO.class));
-    }
-
-    @GetMapping("/teacherPage")
-    @Operation(summary = "获得工作间下导师的成果分页")
-    @PreAuthorize("@ss.hasPermission('system:user-achievement:teacherQuery')")
-    public CommonResult<PageResult<UserAchievementRespVO>> getTeacherAchievementPage(@Valid UserAchievementPageReqVO pageReqVO) {
-        pageReqVO.getUserType().add("3");
-        PageResult<UserAchievementDO>pageResult = userAchievementService.getUserAchievementPage(pageReqVO);
-
+//        System.out.println(pageResult);
         return success(BeanUtils.toBean(pageResult, UserAchievementRespVO.class));
     }
 
-    @GetMapping("/studentPage")
-    @Operation(summary = "获得工作间下学生的成果分页")
-    @PreAuthorize("@ss.hasPermission('system:user-achievement:studentQuery')")
-    public CommonResult<PageResult<UserAchievementRespVO>> getStudentAchievementPage(@Valid UserAchievementPageReqVO pageReqVO) {
-        pageReqVO.getUserType().add("1");
-        pageReqVO.getUserType().add("2");
-        PageResult<UserAchievementDO>pageResult = userAchievementService.getUserAchievementPage(pageReqVO);
-
-        return success(BeanUtils.toBean(pageResult, UserAchievementRespVO.class));
-    }
 
     @GetMapping("/export-excel")
     @Operation(summary = "导出成果 Excel")
@@ -160,12 +139,13 @@ public class UserAchievementController {
                         BeanUtils.toBean(list, UserAchievementRespVO.class));
     }
 
+    //成果详情
     @GetMapping("/selfPage")
     @Operation(summary = "获得自己的成果分页")
     @PreAuthorize("@ss.hasPermission('system:user-achievement:selfQuery')")
     public CommonResult<PageResult<UserAchievementRespVO>> getSelfAchievementPage(@Valid UserAchievementPageReqVO pageReqVO) {
-        Long loginId =SecurityFrameworkUtils.getLoginUserId();
-        pageReqVO.setUserId(loginId);
+//        Long loginId =SecurityFrameworkUtils.getLoginUserId();
+//        pageReqVO.setUserId(loginId);
         PageResult<UserAchievementDO>pageResult = userAchievementService.getUserAchievementPage(pageReqVO);
 
         return success(BeanUtils.toBean(pageResult, UserAchievementRespVO.class));

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/userAchievement/UserAchievementMapper.java

@@ -22,8 +22,8 @@ import org.apache.ibatis.annotations.Select;
 public interface UserAchievementMapper extends BaseMapperX<UserAchievementDO> {
     //都是按时间分页
     //所有用户
+    //按钮进去的成果详情
     default PageResult<UserAchievementDO> selectPage(UserAchievementPageReqVO reqVO) {
-        Long loginId = SecurityFrameworkUtils.getLoginUserId();
         MPJLambdaWrapperX<UserAchievementDO> queryWrapper =new MPJLambdaWrapperX<>();
 
         queryWrapper.betweenIfPresent(UserAchievementDO::getCreateTime,reqVO.getCreateTime())
@@ -38,7 +38,7 @@ public interface UserAchievementMapper extends BaseMapperX<UserAchievementDO> {
                 .eqIfExists(UserAchievementDO::getDetail, reqVO.getDetail())
                 .eqIfExists(UserAchievementDO::getSort,reqVO.getSort())
                 .eqIfExists(UserAchievementDO::getIsGraduate,reqVO.getIsGraduate())
-
+                .eq(AdminUserDO::getDeleted,0)//确保用户也还存在的成果
                 .eqIfExists(UserAchievementDO::getDeptId,reqVO.getDeptId())
                 //用户类型查
                 .orderByDesc(UserAchievementDO::getCreateTime);
@@ -47,7 +47,7 @@ public interface UserAchievementMapper extends BaseMapperX<UserAchievementDO> {
 
         return pageResult;
     }
-
+    //菜单栏的成果详情
     default PageResult<UserAchievementDO> selectAchievementPage(UserAchievementPageReqVO reqVO,Set<Long>roleIds,Long loginId) {
         MPJLambdaWrapperX<UserAchievementDO> queryWrapper =new MPJLambdaWrapperX<>();
 
@@ -63,15 +63,23 @@ public interface UserAchievementMapper extends BaseMapperX<UserAchievementDO> {
                 .eqIfExists(UserAchievementDO::getDetail, reqVO.getDetail())
                 .eqIfExists(UserAchievementDO::getSort,reqVO.getSort())
                 .eqIfExists(UserAchievementDO::getIsGraduate,reqVO.getIsGraduate())
-
+                .eq(AdminUserDO::getDeleted,0)//确保用户也还存在的成果
                 .eqIfExists(UserAchievementDO::getDeptId,reqVO.getDeptId())
                 //用户类型查
                 .orderByDesc(UserAchievementDO::getCreateTime);
 
         if (roleIds.contains(112L)){//学生成果
             queryWrapper.eqIfExists(UserAchievementDO::getUserId, loginId);
-        } else if(roleIds.contains(113L)||roleIds.contains(114L)){//导师或者学院导出学生成果
-            queryWrapper.eqIfExists(UserAchievementDO::getUserId, reqVO.getUserId());
+        } else if(roleIds.contains(113L)){//导师//学生成果
+            if ( reqVO.getUserId()!=null&&reqVO.getUserId()!=0) {
+                queryWrapper.eqIfExists(UserAchievementDO::getUserId, reqVO.getUserId());
+            }else {
+                queryWrapper.eqIfExists(AdminUserDO::getSupervisorId, loginId);
+            }
+        }else if(roleIds.contains(114L)){//学院//学生成果
+            if ( reqVO.getUserId()!=null&&reqVO.getUserId()!=0) {
+                queryWrapper.eqIfExists(UserAchievementDO::getUserId, reqVO.getUserId());
+            }
         }
 
         // 执行分页查询
@@ -96,6 +104,8 @@ public interface UserAchievementMapper extends BaseMapperX<UserAchievementDO> {
                 .eqIfExists(UserAchievementDO::getSort,reqVO.getSort())
                 .eqIfExists(UserAchievementDO::getDeptId,reqVO.getDeptId())
                 .eqIfExists(UserAchievementDO::getIsGraduate,reqVO.getIsGraduate())
+
+                .eq(AdminUserDO::getDeleted,0)//确保用户也还存在的成果
                 //用户类型查
                 .orderByDesc(UserAchievementDO::getCreateTime);