From 3a847c1d671ff21102fa3603043b801a77a29e86 Mon Sep 17 00:00:00 2001
From: ma <1062634917@qq.com>
Date: Fri, 27 Aug 2021 10:02:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ccsens/signin/service/ProjectService.java |  2 +-
 .../main/resources/mapper_dao/ProjectDap.xml  | 49 +++++++++++++------
 2 files changed, 35 insertions(+), 16 deletions(-)

diff --git a/signin/src/main/java/com/ccsens/signin/service/ProjectService.java b/signin/src/main/java/com/ccsens/signin/service/ProjectService.java
index 27a7a34a..d380dbd3 100644
--- a/signin/src/main/java/com/ccsens/signin/service/ProjectService.java
+++ b/signin/src/main/java/com/ccsens/signin/service/ProjectService.java
@@ -190,7 +190,7 @@ public class ProjectService implements IProjectService{
             throw new BaseException(CodeEnum.NOT_PROJECT);
         }
         SysProjectList parentProject = projectDao.selectByProjectId(param.getParentId());
-        if (ObjectUtil.isNull(parentProject)) {
+        if (ObjectUtil.isNull(parentProject) && 0 != param.getParentId()) {
             throw new BaseException(CodeEnum.NOT_PROJECT);
         }
         String sonUrl = sonProject.getUrl().substring(sonProject.getUrl().lastIndexOf(TallConstant.GATEWAY) + 7);
diff --git a/signin/src/main/resources/mapper_dao/ProjectDap.xml b/signin/src/main/resources/mapper_dao/ProjectDap.xml
index 5f8bd4cd..83ea7403 100644
--- a/signin/src/main/resources/mapper_dao/ProjectDap.xml
+++ b/signin/src/main/resources/mapper_dao/ProjectDap.xml
@@ -4,22 +4,41 @@
 
     <select id="queryProjectList" resultType="com.ccsens.signin.bean.vo.ProjectVo$QueryProject">
         SELECT
-        p.project_id as id,
-        p.`name`,
-        p.project_start_time as startTime,
-        p.project_end_time as endTime,
-        p.project_status as `status`,
-        p.url
-        FROM
-        t_sys_user_project up,
-        t_sys_project_list p
-        WHERE
-        up.project_id = p.project_id
-        and up.user_id = #{userId}
-        and p.project_start_time &lt;= #{endTime}
+			p.project_id as id,
+            p.`name`,
+            p.project_start_time as startTime,
+            p.project_end_time as endTime,
+            p.project_status as `status`,
+            p.url
+		FROM
+			t_sys_project_list p
+		LEFT JOIN t_sys_user_project u ON p.project_id = u.project_id
+		AND u.rec_status = 0
+		WHERE
+			p.rec_status = 0
+		AND u.user_id = #{userId}
+		and p.project_start_time &lt;= #{endTime}
         and p.project_end_time &gt;= #{startTime}
-        and up.rec_status = 0 and p.rec_status = 0
-        ORDER BY up.sort
+		AND p.project_id NOT IN (
+			SELECT
+				sp.project_id
+			FROM
+				t_sys_project_list sp
+			LEFT JOIN (
+				SELECT
+					*
+				FROM
+					t_sys_project_list
+				WHERE
+					rec_status = 0
+			) pp ON sp.parent_project_id = pp.project_id
+			LEFT JOIN t_sys_user_project u ON pp.project_id = u.project_id
+			AND u.rec_status = 0
+			WHERE
+				sp.rec_status = 0
+			AND u.user_id = #{userId}
+		)
+		 ORDER BY up.sort
     </select>
 
     <select id="querySonProject" resultType="com.ccsens.signin.bean.vo.ProjectVo$QueryProject">