From 642f841fda40b56c9b04160f31fb95f20e14e03a Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Fri, 24 May 2019 13:45:20 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E8=8E=B7=E5=8F=96=E8=A7=92?= =?UTF-8?q?=E8=89=B2=E6=B7=BB=E5=8A=A0=E7=8A=B6=E6=80=81=E6=8E=A7=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/apiservice/serviceimpl/busi/SysUserService.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java index 919c817..ac4b9b0 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java @@ -634,8 +634,16 @@ public class SysUserService implements ISysUserService { LOGGER.error(" SysUser Peck Role information Error userId : {} Exception Message : {} " ,user.getUserInfoId(),e.getMessage()); e.printStackTrace(); } - - user.setRoleList(roleList); + + if(roleList != null && roleList.size() > 0){ + List list = new ArrayList<>(); + roleList.forEach(role -> { + if(role.getRoleStatus() != null && role.getRoleStatus().equals(CommonEnumUtil.DATA_STATUS.ENABLE.getValue())){ + list.add(role); + } + }); + user.setRoleList(list); + } } /**