From 8684700c19c1a7389506d7b503d596e0cdbad5b7 Mon Sep 17 00:00:00 2001
From: wangliwen <wangliwen@hisense.com>
Date: Wed, 11 May 2022 10:45:03 +0800
Subject: [PATCH] ...

---
 .../src/main/resources/mapper/resourceCar/ResourceCarDao.xml    | 2 +-
 .../mapper/resourceCollection/ResourceCollectionDao.xml         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/renren-admin/src/main/resources/mapper/resourceCar/ResourceCarDao.xml b/renren-admin/src/main/resources/mapper/resourceCar/ResourceCarDao.xml
index be86b2f9..ab9d3efd 100644
--- a/renren-admin/src/main/resources/mapper/resourceCar/ResourceCarDao.xml
+++ b/renren-admin/src/main/resources/mapper/resourceCar/ResourceCarDao.xml
@@ -45,7 +45,7 @@
     select trc.*
     from tb_resource_car trc
         <if test="(params.type != null and params.type != '') or (params.name != null and params.name != '')">
-            left join tb_data_resource tdr on trc.resource_id = tdr.id and tdr.del_flag = 0
+            left join tb_data_resource tdr on trc.resource_id = tdr.id and tdr.del_flag != 1
         </if>
     where 1 = 1
       and trc.del_flag = 0
diff --git a/renren-admin/src/main/resources/mapper/resourceCollection/ResourceCollectionDao.xml b/renren-admin/src/main/resources/mapper/resourceCollection/ResourceCollectionDao.xml
index 4850bebf..acd8783a 100644
--- a/renren-admin/src/main/resources/mapper/resourceCollection/ResourceCollectionDao.xml
+++ b/renren-admin/src/main/resources/mapper/resourceCollection/ResourceCollectionDao.xml
@@ -57,7 +57,7 @@
         SELECT trc.*
         FROM tb_resource_collection trc
         <if test="(params.type != null and params.type != '') or (params.name != null and params.name != '')">
-            LEFT JOIN tb_data_resource tdr ON trc.resource_id = tdr.id AND tdr.del_flag = 0
+            LEFT JOIN tb_data_resource tdr ON trc.resource_id = tdr.id AND tdr.del_flag != 1
         </if>
         WHERE 1 = 1
         AND trc.del_flag = 0