WxxyDeveloper/JSL_OrganizeInternalOA
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:我管理的状态查询
All checks were successful
代码检查 / 代码检查 (pull_request) Successful in 17s
Details

Browse Source
This commit is contained in:
176yunxuan 2024-04-17 20:43:27 +08:00
parent d2dc0527ab
commit 2bd1d796ed
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/jsl/oa/controllers/ProjectController.java
View File

@ -114,13 +114,13 @@ public class ProjectController {
@GetMapping("/project/child/get") @GetMapping("/project/child/get")
public BaseResponse projectModuleGet( public BaseResponse projectModuleGet(
@RequestParam(required = false) List<String> tags, @RequestParam(required = false) List<String> tags,
@RequestParam(required = false) List<String> isFinish, @RequestParam(required = false) List<String> status,
@RequestParam(required = false) Integer is, @RequestParam(required = false) Integer is,
@RequestParam(required = false, defaultValue = "1") Integer page, @RequestParam(required = false, defaultValue = "1") Integer page,
@RequestParam(required = false, defaultValue = "10") Integer pageSize, @RequestParam(required = false, defaultValue = "10") Integer pageSize,
HttpServletRequest request HttpServletRequest request
) { ) {
return projectService.workGet(request, tags, isFinish, is, page, pageSize); return projectService.workGet(request, tags, status, is, page, pageSize);
} }
/** /**

2
src/main/resources/com/jsl/oa/mapper/ProjectMapper.xml
View File

@ -110,7 +110,7 @@
<if test="is != null"> <if test="is != null">
(principal_id = #{userId} and is_delete=false) or (principal_id = #{userId} and is_delete=false) or
</if> </if>
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
<foreach collection="isFinish" item="Finish" separator="," open="(" close="))"> <foreach collection="isFinish" item="Finish" separator="," open="(" close="))">
#{Finish} #{Finish}
</foreach> </foreach>