From 3101ed371b391a7fb48667bdb62fd6b3821019a4 Mon Sep 17 00:00:00 2001
From: 176yunxuan <362612387@qq.com~>
Date: Thu, 14 Mar 2024 20:54:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=90=E7=B3=BB=E7=BB=9F=E5=AD=90=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/jsl/oa/model/voData/ProjectWorkVO.java |  2 +-
 .../resources/com/jsl/oa/mapper/ProjectMapper.xml   | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/jsl/oa/model/voData/ProjectWorkVO.java b/src/main/java/com/jsl/oa/model/voData/ProjectWorkVO.java
index 18eac73..b22ebdd 100644
--- a/src/main/java/com/jsl/oa/model/voData/ProjectWorkVO.java
+++ b/src/main/java/com/jsl/oa/model/voData/ProjectWorkVO.java
@@ -11,7 +11,7 @@ public class ProjectWorkVO {
     private Long pid;
     @NotNull(message = "项目id不能为空")
     private Long projectId;
-    @NotNull(message = "负责人id不能为空")
+
     private Long principalId;
     @NotNull(message = "周期不能为空")
     private Integer cycle;
diff --git a/src/main/resources/com/jsl/oa/mapper/ProjectMapper.xml b/src/main/resources/com/jsl/oa/mapper/ProjectMapper.xml
index 6367033..b2c7616 100644
--- a/src/main/resources/com/jsl/oa/mapper/ProjectMapper.xml
+++ b/src/main/resources/com/jsl/oa/mapper/ProjectMapper.xml
@@ -48,7 +48,7 @@
     </update>
 
     <select id="getByTags" resultType="com.jsl.oa.model.doData.ProjectDO">
-        select * from organize_oa.oa_project where is_delete=false and principal_id=#{userId} and
+        select * from organize_oa.oa_project where is_delete=false and principal_id=#{userId} and status=1 and
         <foreach collection="tags" item="tag" separator=",'%') or json_extract(tags,'$.tags')like concat('%',"
                  open="json_extract(tags,'$.tags')like concat('%',"
                  close=",'%')">
@@ -57,14 +57,15 @@
     </select>
 
     <select id="getByIsfinish" resultType="com.jsl.oa.model.doData.ProjectDO">
-        select * from organize_oa.oa_project where is_delete=false and principal_id =#{userId} and is_finish in
+        select * from organize_oa.oa_project where is_delete=false and principal_id =#{userId} and status=1 and is_finish in
         <foreach collection="isFinish" item="Finish" separator="," open="(" close=")">
             #{Finish}
         </foreach>
     </select>
 
     <select id="workgetByTags" resultType="com.jsl.oa.model.doData.ProjectDO">
-        select * from organize_oa.oa_project where id in(select project_id from organize_oa.oa_project_work where is_delete=false and (principal_id=#{userId} or principal_id is null) and project_id in(
+        select * from organize_oa.oa_project where id in(select project_id from organize_oa.oa_project_work
+        where is_delete=false and (principal_id=#{userId} or principal_id is null) and project_id in(
             select id from organize_oa.oa_project where
         <foreach collection="tags" item="tag" separator=",'%') or json_extract(tags,'$.tags')like concat('%',"
                  open="json_extract(tags,'$.tags')like concat('%',"
@@ -82,14 +83,14 @@
     </select>
 
     <select id="tget" resultType="com.jsl.oa.model.doData.ProjectDO">
-        select * from organize_oa.oa_project where is_delete=false
+        select * from organize_oa.oa_project where is_delete=false and status=1
         <if test="id != null">
             and id=#{id}
         </if>
     </select>
 
     <select id="tgetBytags" resultType="com.jsl.oa.model.doData.ProjectDO">
-        select * from organize_oa.oa_project where is_delete=false and
+        select * from organize_oa.oa_project where is_delete=false and status=1 and
         <foreach collection="tags" item="tag" separator=",'%') or json_extract(tags,'$.tags')like concat('%',"
                  open="json_extract(tags,'$.tags')like concat('%',"
                  close=",'%')">
@@ -98,7 +99,7 @@
     </select>
 
     <select id="tgetByIsfinish" resultType="com.jsl.oa.model.doData.ProjectDO">
-        select * from organize_oa.oa_project where is_delete=false and is_finish in
+        select * from organize_oa.oa_project where is_delete=false and status=1 and is_finish in
         <foreach collection="isFinish" item="Finish" separator="," open="(" close=")">
             #{Finish}
         </foreach>