From b446560ccc97aedde9917db2273c6c6fb8b71acb Mon Sep 17 00:00:00 2001 From: ludc Date: 星期日, 14 一月 2024 17:05:29 +0800 Subject: [PATCH] 277:参照配置界面，关于包含条件，同一个字段具备多个包含条件时，需要重新设置一下界面更改一下后端查询接口 --- Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/wrapper/UserWrapper.java | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/wrapper/UserWrapper.java b/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/wrapper/UserWrapper.java index a72b04d..69697f8 100644 --- a/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/wrapper/UserWrapper.java +++ b/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/wrapper/UserWrapper.java @@ -47,12 +47,14 @@ List<String> roleName = SysCache.getRoleNames(user.getRoleId()); List<String> deptName = SysCache.getDeptNames(user.getDeptId()); List<String> postName = SysCache.getPostNames(user.getPostId()); - userVO.setTenantName(tenant.getTenantName()); + userVO.setTenantName(tenant==null?"":tenant.getTenantName()); userVO.setRoleName(Func.join(roleName)); userVO.setDeptName(Func.join(deptName)); userVO.setPostName(Func.join(postName)); userVO.setSexName(DictCache.getValue(DictEnum.SEX, user.getSex())); userVO.setUserTypeName(DictCache.getValue(DictEnum.USER_TYPE, user.getUserType())); + userVO.setUserStatus(user.getUserStatus()); + userVO.setUserStatusText(DictCache.getValue(DictEnum.USER_STATUS,user.getUserStatus()));//鐢ㄦ埛鐘舵�� return userVO; } -- Gitblit v1.9.3