修改查询项目列表

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);

signin/src/main/resources/mapper_dao/ProjectDap.xml

@@ -11,14 +11,33 @@
             p.project_status as `status`,
             p.url
 		FROM
-        t_sys_user_project up,
 			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
-        up.project_id = p.project_id
-        and up.user_id = #{userId}
+			p.rec_status = 0
+		AND u.user_id = #{userId}
 		and p.project_start_time <= #{endTime}
         and p.project_end_time >= #{startTime}
-        and up.rec_status = 0 and p.rec_status = 0
+		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>