备份

ruoyi-oa/src/main/java/com/ruoyi/oa/controller/OaSalaryController.java

@@ -53,7 +53,7 @@ public class OaSalaryController extends BaseController {
     @SaCheckPermission("oa:salary:list")
     @GetMapping("/list-worker")
     public TableDataInfo<OaSalaryVo> listWorker(OaSalaryBo bo, PageQuery pageQuery) {
-        return iOaSalaryService.queryPageList(bo, pageQuery);
+        return iOaSalaryService.listWorker(bo, pageQuery);
     }
 
     /**
@@ -78,13 +78,11 @@ public class OaSalaryController extends BaseController {
     /**
      * 获取薪资管理详细信息
      *
-     * @param salaryId 主键
      */
     @SaCheckPermission("oa:salary:query")
-    @GetMapping("/{salaryId}")
-    public R<OaSalaryVo> getInfo(@NotNull(message = "主键不能为空")
-                                 @PathVariable Long salaryId) {
-        return R.ok(iOaSalaryService.queryById(salaryId));
+    @GetMapping("/detail")
+    public R<OaSalaryVo> getInfo(@RequestBody OaSalaryBo bo) {
+        return R.ok(iOaSalaryService.queryById(bo.getSalaryId(),bo.getPayTime()));
     }
 
     /**