From 8352283f713cd8623986f6561bec0ecb4876b580 Mon Sep 17 00:00:00 2001
From: wangliwen <wangliwen@hisense.com>
Date: Wed, 9 Nov 2022 12:12:16 +0800
Subject: [PATCH] ...

---
 .../resource/controller/ResourceController.java      | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/renren-admin/src/main/java/io/renren/modules/resource/controller/ResourceController.java b/renren-admin/src/main/java/io/renren/modules/resource/controller/ResourceController.java
index 3fe9c2be..79f425d2 100644
--- a/renren-admin/src/main/java/io/renren/modules/resource/controller/ResourceController.java
+++ b/renren-admin/src/main/java/io/renren/modules/resource/controller/ResourceController.java
@@ -166,11 +166,6 @@ public class ResourceController {
             @ApiImplicitParam(name = "approveStatus", value = "审核状态，可选值(通过、审核中)", paramType = "query", dataType = "String"),
     })
     public void exportSelectCensusResourceTable(@RequestParam Map<String, Object> params, HttpServletResponse response) throws IOException {
-//        UserDetail user = SecurityUser.getUser();
-//        if (user.getDeptId() != null) {
-//            SysDeptDTO sysDeptDTO = sysDeptService.get(user.getDeptId());
-//            params.put("region", sysDeptDTO.getDistrict()); // 管理员只出本部门区域
-//        }
         List<ResourceDTO> result = resourceService.list(params);
         List<List<Object>> date = result.stream().map(index -> {
             List<Object> data = new ArrayList<>();
@@ -182,7 +177,12 @@ public class ResourceController {
             } else {
                 data.add("--");
             }
-            Optional<String> yyly = index.getInfoList().stream().filter(index_ -> index_.getAttrType().equals("应用领域") && index_.getDelFlag().intValue() == 0).map(index_ -> index_.getAttrValue()).findFirst();
+//            Optional<String> yyly = index.getInfoList()
+//                    .stream()
+//                    .filter(index_ -> index_.getAttrType().equals("应用领域") && index_.getDelFlag().intValue() == 0)
+//                    .map(index_ -> index_.getAttrValue()).findFirst();
+            String sql = String.format("SELECT attr_value FROM tb_data_attr WHERE data_resource_id = %d AND attr_type = '应用领域' AND del_flag = 0 LIMIT 1;", index.getId());
+            Optional<String> yyly = Optional.ofNullable(jdbcTemplate.queryForObject(sql, String.class));
             if (yyly.isPresent()) {
                 data.add(yyly.get());
             } else {