From 451a5629dee853395225777985f077b4967bcac9 Mon Sep 17 00:00:00 2001
From: wangliwen <wangliwen@hisense.com>
Date: Tue, 10 Jan 2023 18:17:56 +0800
Subject: [PATCH] ...

---
 .../controller/TAbilityApplicationController.java           | 6 ++++++
 .../service/impl/TAbilityApplicationServiceImpl.java        | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/renren-admin/src/main/java/io/renren/modules/processForm/controller/TAbilityApplicationController.java b/renren-admin/src/main/java/io/renren/modules/processForm/controller/TAbilityApplicationController.java
index 44d874a3..01dc373d 100644
--- a/renren-admin/src/main/java/io/renren/modules/processForm/controller/TAbilityApplicationController.java
+++ b/renren-admin/src/main/java/io/renren/modules/processForm/controller/TAbilityApplicationController.java
@@ -805,6 +805,12 @@ public class TAbilityApplicationController {
             temp.put("system", index.getSystem());
             temp.put("resourceId", index.getResourceId());
             ResourceDTO resourceDTO = resourceService.get(Long.parseLong(index.getResourceId()));
+            try {
+                temp.put("resourceDept", sysDeptService.get(resourceDTO.getDeptId()).getName());
+            } catch (Exception exception) {
+                temp.put("resourceDept", "-");
+            }
+            temp.put("", resourceDTO.getDescription());
             if ("应用资源".equals(resourceDTO.getType())) {
                 temp.put("resourceTYpe", "应用资源");
             } else if ("组件服务".equals(resourceDTO.getType())) {
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 6515baa7..0476efb0 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
@@ -85,9 +85,9 @@ public class TAbilityApplicationServiceImpl extends CrudServiceImpl<TAbilityAppl
                     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).exists(resource_sql).ne("approve_status", "不通过");
+                        wrapper.exists(sql).exists(resource_sql).eq("approve_status", "通过");
                     } else {
-                        wrapper.notExists(sql).exists(resource_sql).ne("approve_status", "不通过");
+                        wrapper.notExists(sql).exists(resource_sql).eq("approve_status", "通过");
                     }
                     break;
             }