Merge remote-tracking branch 'origin/test-merge' into test-merge

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/ProjectInfoMapper.xml

@@ -153,7 +153,8 @@
         WHERE id = #{id}
     </select>
     <select id="pageList" resultType="org.springblade.manager.vo.ProjectInfoVO">
-        select distinct a.*, if(b.id is null , 0, 1) as isCollect, (select name from blade_user where id = a.project_leader) as projectLeaderName from m_project_info a left join m_user_project_collect b on a.id = b.project_id and b.user_id = #{vo.userId} where a.is_deleted = 0
+        select distinct a.*, if(b.id is null , 0, 1) as isCollect, (select name from blade_user where id = a.project_leader) as projectLeaderName from m_project_info a left join m_user_project_collect b
+            on a.id = b.project_id and b.user_id = #{vo.userId} and b.is_deleted = 0 where a.is_deleted = 0
         <if test="vo.name != null and vo.name != ''">
             and (a.project_name like concat('%',#{vo.name},'%') or a.project_alias like concat('%',#{vo.name},'%'))
         </if>
@@ -161,7 +162,7 @@
             and a.project_status = #{vo.status}
         </if>
         <if test="vo.isCollect != null and vo.isCollect == 1">
-            and b.id is not null and b.is_deleted = 0
+            and b.id is not null
         </if>
         <choose>
             <when test="vo.sort == 0">