From a85cb705274d8fbd9f5fba86ff1c39c13ac66de0 Mon Sep 17 00:00:00 2001 From: xiejun <xj@2023> Date: 星期一, 16 十月 2023 17:46:02 +0800 Subject: [PATCH] 1.用户加控制启用，停用状态 2.根据流水依赖获取最大流水值 --- Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/wrapper/UserWrapper.java | 5 +++-- 1 files changed, 3 insertions(+), 2 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..20eaee3 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,13 +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.setUserStatus_text(DictCache.getValue(DictEnum.USER_STATUS,user.getUserStatus()));//鐢ㄦ埛鐘舵�� return userVO; } - } -- Gitblit v1.9.3