From 49429bad1036c81c056faeadfa009c53ba777fad Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期二, 07 五月 2024 18:02:11 +0800
Subject: [PATCH] feat：反馈保存、展示、处理、删除
---
src/main/java/com/mindskip/xzs/controller/admin/DepartmentController.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/mindskip/xzs/controller/admin/DepartmentController.java b/src/main/java/com/mindskip/xzs/controller/admin/DepartmentController.java
index 103f7e8..5228899 100644
--- a/src/main/java/com/mindskip/xzs/controller/admin/DepartmentController.java
+++ b/src/main/java/com/mindskip/xzs/controller/admin/DepartmentController.java
@@ -17,6 +17,7 @@
import com.mindskip.xzs.utility.PageInfoHelper;
import com.mindskip.xzs.viewmodel.admin.department.DepartmentResponseVM;
import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -107,7 +108,10 @@
List<UserDepartment> userDepartments = userDepartmentMapper.selectByDepartmentId(e.getId());
List<User> list = new ArrayList<>();
for (UserDepartment userDepartment : userDepartments) {
- list.add(userService.getUserById(userDepartment.getUserId()));
+ User user = userService.getUserById(userDepartment.getUserId());
+ if (ObjectUtils.isNotEmpty(user)) {
+ list.add(user);
+ }
}
departmentVO.setUserList(list);
departmentVO.setDepartment(e);
--
Gitblit v1.8.0