diff --git a/src/main/java/com/jsl/oa/controllers/ProjectController.java b/src/main/java/com/jsl/oa/controllers/ProjectController.java index 308a453..a37aafd 100755 --- a/src/main/java/com/jsl/oa/controllers/ProjectController.java +++ b/src/main/java/com/jsl/oa/controllers/ProjectController.java @@ -114,13 +114,13 @@ public class ProjectController { @GetMapping("/project/child/get") public BaseResponse projectModuleGet( @RequestParam(required = false) List tags, - @RequestParam(required = false) List isFinish, + @RequestParam(required = false) List status, @RequestParam(required = false) Integer is, @RequestParam(required = false, defaultValue = "1") Integer page, @RequestParam(required = false, defaultValue = "10") Integer pageSize, HttpServletRequest request ) { - return projectService.workGet(request, tags, isFinish, is, page, pageSize); + return projectService.workGet(request, tags, status, is, page, pageSize); } /** diff --git a/src/main/resources/com/jsl/oa/mapper/ProjectMapper.xml b/src/main/resources/com/jsl/oa/mapper/ProjectMapper.xml index 33e4bbf..08c2a43 100644 --- a/src/main/resources/com/jsl/oa/mapper/ProjectMapper.xml +++ b/src/main/resources/com/jsl/oa/mapper/ProjectMapper.xml @@ -110,7 +110,7 @@ (principal_id = #{userId} and is_delete=false) or - id in(select project_id from organize_oa.oa_project_child where is_delete=false and (principal_id=#{userId}) and oa_project.status in + id in(select project_id from organize_oa.oa_project_child where is_delete=false and (principal_id=#{userId}) and status in #{Finish}