Merge branch 'master' of http://git.ht-atia.cn/qinyanlei/inspect

inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolResultMapper.xml

@@ -199,7 +199,7 @@
         a.data_type,
         JSON_VALUE(b.result_content, '$**.resImageUrl') imgAnalyse
         from patrol_result a
-        LEFT JOIN result_analysis b on a.line_id=b.business_id
+        LEFT JOIN result_analysis b on a.line_id=b.business_id and a.task_patrolled_id = b.task_patrol_id
         <where>
             <if test="taskCode != null  and taskCode != ''">and a.task_code = #{taskCode}</if>
             <if test="taskPatrolledId != null  and taskPatrolledId != ''">and a.task_patrolled_id=#{taskPatrolledId}