Merge branch 'test' into 'main'

修改个人考评修改个人考评 See merge request !129

Merge branch 'test' into 'main'
修改个人考评修改个人考评 See merge request !129
姜超
2 parents 9990b9e0 36ec8cd1
Showing 1 changed file with 9 additions and 24 deletions
fw-morax-server/src/main/java/cn/fw/morax/server/controller/app/EvalPoolController.java
@@ -71,23 +71,6 @@ public class EvalPoolController {
     }
     /**
-     * 人员信息
-     *
-     * @return
-     * @ignoreParams currentUser
-     */
-    @GetMapping("/staff-info")
-    @ControllerMethod("人员信息")
-    public Message<EvalUserPoolVO> queryUser(@CurrentUser LoginAuthBean user) {
-        EvalUserPoolVO poolVO = new EvalUserPoolVO();
-        if (PublicUtil.isNotEmpty(user)) {
-            poolVO.setUserId(user.getUserId());
-            poolVO.setUserName(user.getUserName());
-        }
-        return success(poolVO);
-    }
-
-    /**
      * 本月可查看的其他考评池选项
      *
      * @param user      用户id
@@ -107,7 +90,8 @@ public class EvalPoolController {
         if (Objects.isNull(userId)) {
             userId = user.getUserId();
         }
-        return success(evalGroupPoolService.evalPoolSelector(userId, monthly));
+//        return success(evalGroupPoolService.evalPoolSelector(userId, monthly));
+        return success();
     }
     /**
@@ -115,11 +99,11 @@ public class EvalPoolController {
      */
     @GetMapping("/own-detail")
     @ControllerMethod("考评详情查询")
-    public Message<List<EvalUserRankStageVO>> evalPoolOwnDetail(@CurrentUser Long userId,
-                                                                @Valid EvalUserRankDTO dto) {
-        dto.initMonthly();
-        dto.setUserId(userId);
-        return success(evalGroupPoolService.queryRankStagePools(dto));
+    public Message<List<EvalUserRankStageVO>> evalPoolOwnDetail(@CurrentUser Long userId) {
+//        dto.initMonthly();
+//        dto.setUserId(userId);
+//        return success(evalGroupPoolService.queryRankStagePools(dto));
+        return success();
     }
     /**
@@ -133,7 +117,8 @@ public class EvalPoolController {
         if (PublicUtil.isEmpty(dto.getUserId())) {
             throw new BusinessException("人员信息不能为空");
         }
-        return success(evalGroupPoolService.queryRankStagePools(dto));
+//        return success(evalGroupPoolService.queryRankStagePools(dto));
+        return success();
     }
     /**