Merge branch 'v1.7' of https://github.com/metersphere/metersphere into v1.7

backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanReportMapper.xml

@@ -4,10 +4,12 @@
 
     <select id="list" resultType="io.metersphere.track.dto.TestPlanReportDTO"
             parameterType="io.metersphere.track.request.report.QueryTestPlanReportRequest">
-        SELECT tpr.id AS id, tpr.`name` AS `name`, tp.`name` AS testPlanName, u.name AS creator, tpr.create_time AS createTime,tpr.trigger_Mode AS triggerMode,tpr.status AS status
+        SELECT tpr.id AS id, tpr.`name` AS `name`, tp.`name` AS testPlanName,
+        IF(u.name is null,tpr.creator,u.name)AS creator,
+        tpr.create_time AS createTime,tpr.trigger_Mode AS triggerMode,tpr.status AS status
         FROM test_plan tp
         INNER JOIN test_plan_report tpr on tp.id = tpr.test_plan_id
-        INNER JOIN user u on tpr.creator = u.id
+        LEFT JOIN user u on tpr.creator = u.id
         <where>
             <if test="name != null">
                 and tpr.name like CONCAT('%', #{name},'%')