From 1047569a77edabd899ff7233de24ee415c014ff1 Mon Sep 17 00:00:00 2001
From: wangliwen <wangliwen@hisense.com>
Date: Fri, 5 Aug 2022 12:48:03 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=82=E3=80=82=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../renren/modules/resource/controller/ResourceController.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 62912c85..8aa323c8 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
@@ -133,7 +133,8 @@ public class ResourceController {
         page.getList().forEach(item -> {
             item.setInfoList(resourceService.selectAttrsByResourceId(item.getId()));
             if (item.getDeptId() != null) {
-                String deptName = sysDeptService.get(item.getDeptId()) == null ? null : sysDeptService.get(item.getDeptId()).getName();
+                SysDeptDTO deptDTO = sysDeptService.get(item.getDeptId());
+                String deptName = deptDTO == null ? null : deptDTO.getName();
                 item.setDeptName(StringUtils.isNotBlank(deptName) ? deptName : "--");
             }
         });