From 9f9c631f77712e8cd47bf0a6ee982ed2085364f2 Mon Sep 17 00:00:00 2001
From: wangliwen <wangliwen@hisense.com>
Date: Tue, 10 Jan 2023 11:39:45 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=87=E6=BB=A4=E8=83=BD=E5=8A=9B=E8=B5=84?=
 =?UTF-8?q?=E6=BA=90=E4=B8=8D=E5=AD=98=E5=9C=A8=E7=9A=84=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=E4=BE=9B=E8=AF=84=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/TAbilityApplicationServiceImpl.java         | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/renren-admin/src/main/java/io/renren/modules/processForm/service/impl/TAbilityApplicationServiceImpl.java b/renren-admin/src/main/java/io/renren/modules/processForm/service/impl/TAbilityApplicationServiceImpl.java
index 34454acb..6515baa7 100644
--- a/renren-admin/src/main/java/io/renren/modules/processForm/service/impl/TAbilityApplicationServiceImpl.java
+++ b/renren-admin/src/main/java/io/renren/modules/processForm/service/impl/TAbilityApplicationServiceImpl.java
@@ -83,10 +83,11 @@ public class TAbilityApplicationServiceImpl extends CrudServiceImpl<TAbilityAppl
                 case "score":
                     boolean score = Boolean.valueOf(params.get("score").toString());
                     String sql = "SELECT 1 FROM tb_resource_score t1 WHERE t1.user_id = t_ability_application.user_id AND t1.resource_id = t_ability_application.resource_id";
+                    String resource_sql = "SELECT 1 FROM tb_data_resource WHERE tb_data_resource.del_flag = 0 AND t_ability_application.resource_id = tb_data_resource.id";
                     if (score) {
-                        wrapper.exists(sql).ne("approve_status", "不通过");
+                        wrapper.exists(sql).exists(resource_sql).ne("approve_status", "不通过");
                     } else {
-                        wrapper.notExists(sql).ne("approve_status", "不通过");
+                        wrapper.notExists(sql).exists(resource_sql).ne("approve_status", "不通过");
                     }
                     break;
             }