diff --git a/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/user/UserProfileController.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/user/UserProfileController.java index f10b133..da7402d 100644 --- a/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/user/UserProfileController.java +++ b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/user/UserProfileController.java @@ -24,6 +24,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import java.util.Collections; import java.util.List; import static org.agt.framework.common.pojo.CommonResult.success; @@ -58,7 +59,7 @@ public class UserProfileController { // 获得部门信息 DeptDO dept = user.getDeptId() != null ? deptService.getDept(user.getDeptId()) : null; // 获得岗位信息 - List posts = CollUtil.isNotEmpty(user.getPostIds()) ? postService.getPostList(user.getPostIds()) : null; + List posts = CollUtil.isNotEmpty(user.getPostIds()) ? postService.getPostList(user.getPostIds()) : Collections.emptyList(); return success(UserConvert.INSTANCE.convert(user, userRoles, dept, posts)); }