修改备样管理数据不显示；

src/main/resources/mapper/hmhj/EntrustSampleBackupMapper.xml

@@ -4,7 +4,7 @@
 
     <sql id="where">
         <where>
-            AND b.deleted = 0 AND s.deleted = 0
+            AND b.deleted = 0
             <if test="null!=vo.sampleCode">
                 AND s.code LIKE CONCAT('%',#{vo.sampleCode},'%')
             </if>
@@ -53,10 +53,9 @@
             date_part('day', CAST(b.storage_period AS TIMESTAMP) - CAST( now() AS TIMESTAMP)) "remain_days"
         FROM
         entrust_sample_backup b
-        JOIN entrust_sample s ON b.sample_id = s.ID
-        JOIN entrust e ON s.entrust_id = e.ID
+        JOIN entrust_sample s ON b.sample_id = s.ID and s.deleted = 0
+        JOIN entrust e ON s.entrust_id = e.ID AND e.deleted = 0
         <include refid="where"/>
-        AND e.deleted = 0
         order by date_part('day', CAST(b.storage_period AS TIMESTAMP) - CAST( now() AS TIMESTAMP)) asc,b.ctime desc
     </select>
 
@@ -102,10 +101,9 @@
             (case when e.sample_handle_advise = '检测完毕退还' and s.status &gt; 20 then 1 else 0 end) "weights"
         FROM
             entrust_sample_backup b
-        JOIN entrust_sample s ON b.sample_id = s.ID
-        JOIN entrust e ON s.entrust_id = e.ID
+        JOIN entrust_sample s ON b.sample_id = s.ID and s.deleted = 0
+        JOIN entrust e ON s.entrust_id = e.ID AND e.deleted = 0
         <include refid="where"/>
-        AND e.deleted = 0
         order by (case when e.sample_handle_advise = '检测完毕退还' and s.status &gt;20 then 1 else 0 end) desc, b.ctime desc
     </select>