Merge branch 'han' of uskycloud/usky-modules into server-165

service-fire/service-fire-biz/src/main/resources/mapper/fire/ReportConfigMapper.xml

@@ -20,8 +20,9 @@
         LEFT JOIN report_index_config e ON e.report_id = d.id
         <where>
             <if test="tenantId != null and tenantId != ''">
-                and e.tenant_id = #{tenantId}
+                and d.tenant_id = #{tenantId}
             </if>
+            and d.delete_flag = 0
         </where>
         GROUP BY d.id
     </select>
@@ -32,11 +33,12 @@
         LEFT JOIN report_index_config e ON e.report_id = d.id
         <where>
             <if test="tenantId != null and tenantId != ''">
-                and e.tenant_id = #{tenantId}
+                and d.tenant_id = #{tenantId}
             </if>
             <if test="indexGrade != null and indexGrade != ''">
                 and e.index_grade = #{indexGrade}
             </if>
+            and d.delete_flag = 0
         </where>
         GROUP BY d.id
     </select>