-
mentioned in commit a1e5c25d
Showing
1 changed file
fw-morax-server/src/main/java/cn/fw/morax/server/controller/app/EvalPoolController.java
... | ... | @@ -71,23 +71,6 @@ public class EvalPoolController { |
71 | 71 | } |
72 | 72 | |
73 | 73 | /** |
74 | - * 人员信息 | |
75 | - * | |
76 | - * @return | |
77 | - * @ignoreParams currentUser | |
78 | - */ | |
79 | - @GetMapping("/staff-info") | |
80 | - @ControllerMethod("人员信息") | |
81 | - public Message<EvalUserPoolVO> queryUser(@CurrentUser LoginAuthBean user) { | |
82 | - EvalUserPoolVO poolVO = new EvalUserPoolVO(); | |
83 | - if (PublicUtil.isNotEmpty(user)) { | |
84 | - poolVO.setUserId(user.getUserId()); | |
85 | - poolVO.setUserName(user.getUserName()); | |
86 | - } | |
87 | - return success(poolVO); | |
88 | - } | |
89 | - | |
90 | - /** | |
91 | 74 | * 本月可查看的其他考评池选项 |
92 | 75 | * |
93 | 76 | * @param user 用户id |
... | ... | @@ -107,7 +90,8 @@ public class EvalPoolController { |
107 | 90 | if (Objects.isNull(userId)) { |
108 | 91 | userId = user.getUserId(); |
109 | 92 | } |
110 | - return success(evalGroupPoolService.evalPoolSelector(userId, monthly)); | |
93 | +// return success(evalGroupPoolService.evalPoolSelector(userId, monthly)); | |
94 | + return success(); | |
111 | 95 | } |
112 | 96 | |
113 | 97 | /** |
... | ... | @@ -115,11 +99,11 @@ public class EvalPoolController { |
115 | 99 | */ |
116 | 100 | @GetMapping("/own-detail") |
117 | 101 | @ControllerMethod("考评详情查询") |
118 | - public Message<List<EvalUserRankStageVO>> evalPoolOwnDetail(@CurrentUser Long userId, | |
119 | - @Valid EvalUserRankDTO dto) { | |
120 | - dto.initMonthly(); | |
121 | - dto.setUserId(userId); | |
122 | - return success(evalGroupPoolService.queryRankStagePools(dto)); | |
102 | + public Message<List<EvalUserRankStageVO>> evalPoolOwnDetail(@CurrentUser Long userId) { | |
103 | +// dto.initMonthly(); | |
104 | +// dto.setUserId(userId); | |
105 | +// return success(evalGroupPoolService.queryRankStagePools(dto)); | |
106 | + return success(); | |
123 | 107 | } |
124 | 108 | |
125 | 109 | /** |
... | ... | @@ -133,7 +117,8 @@ public class EvalPoolController { |
133 | 117 | if (PublicUtil.isEmpty(dto.getUserId())) { |
134 | 118 | throw new BusinessException("人员信息不能为空"); |
135 | 119 | } |
136 | - return success(evalGroupPoolService.queryRankStagePools(dto)); | |
120 | +// return success(evalGroupPoolService.queryRankStagePools(dto)); | |
121 | + return success(); | |
137 | 122 | } |
138 | 123 | |
139 | 124 | /** | ... | ... |