From 2bd1d796ed97dc22a82998fc1f2f203170e7fa90 Mon Sep 17 00:00:00 2001
From: 176yunxuan <362612387@qq.com~>
Date: Wed, 17 Apr 2024 20:43:27 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=88=91=E7=AE=A1=E7=90=86=E7=9A=84?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/jsl/oa/controllers/ProjectController.java | 4 ++--
 src/main/resources/com/jsl/oa/mapper/ProjectMapper.xml      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

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<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);
     }
 
     /**
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 @@
         <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>