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

develop #21

Merged
XiaoLFeng merged 5 commits from develop into master 2024-04-17 23:08:53 +08:00
Conversation 0 Commits 5 Files Changed 18 +3 -3
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2bd1d796ed - Show all commits

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

@ -114,13 +114,13 @@ public class ProjectController {
@GetMapping("/project/child/get")
public BaseResponse projectModuleGet(
@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, 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);
}
/**

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

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