From 91e9e3cef47901fe796669fb9c90f19cbbeadf48 Mon Sep 17 00:00:00 2001 From: xiejun <xj@2023> Date: 星期二, 17 十月 2023 10:14:00 +0800 Subject: [PATCH] 用户停用/启用功能增加 --- Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/service/impl/UserServiceImpl.java | 21 ++++++++++++++++++--- 1 files changed, 18 insertions(+), 3 deletions(-) diff --git a/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/service/impl/UserServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/service/impl/UserServiceImpl.java index 943f36f..c1f7528 100644 --- a/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/service/impl/UserServiceImpl.java +++ b/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/service/impl/UserServiceImpl.java @@ -84,7 +84,7 @@ @Transactional(rollbackFor = Exception.class) public boolean submit(User user) { if (StringUtil.isBlank(user.getTenantId())) { - // user.setTenantId(BladeConstant.ADMIN_TENANT_ID); + // user.setTenantId(nacosConfigCache.getAdminUserInfo().getTenantId()); // 榛樿璁剧疆涓虹鐞嗙粍涓嬬殑鐢ㄦ埛 user.setTenantId(nacosConfigCache.getAdminUserInfo().getTenantId()); } @@ -106,7 +106,7 @@ Boolean flag = true; for (User user : users){ if (StringUtil.isBlank(user.getTenantId())) { - user.setTenantId(BladeConstant.ADMIN_TENANT_ID); + user.setTenantId(nacosConfigCache.getAdminUserInfo().getTenantId()); } String tenantId = user.getTenantId(); if (Func.isNotEmpty(user.getPassword())) { @@ -166,7 +166,7 @@ @Override public List<User> selectAllUser(User user, Long deptId){ List<Long> deptIdList = SysCache.getDeptChildIds(deptId); - List<User> users = baseMapper.selectUserPage(user, deptIdList, (AuthUtil.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID) ? StringPool.EMPTY : AuthUtil.getTenantId())); + List<User> users = baseMapper.selectUserPage(user, deptIdList, (AuthUtil.getTenantId().equals(nacosConfigCache.getAdminUserInfo().getTenantId()) ? StringPool.EMPTY : AuthUtil.getTenantId())); return users; } @@ -570,6 +570,21 @@ return list.stream().distinct().collect(Collectors.toList()); } + /*** + * 鏇存柊鐢ㄦ埛鍚敤鍋滅敤鐘舵�� + * @param userIds + * @param status + * @return + */ + @Override + public boolean updateUserStatus(String userIds, boolean status) { + Integer user_status=0; + if(!status){ + user_status=1; + } + return this.update(Wrappers.<User>lambdaUpdate().in(User::getId, Func.toLongList(userIds)).set(User::getUserStatus,user_status)); + } + /** * 鏃ユ湡鏃堕棿鏍煎紡杞ぉ * @param date -- Gitblit v1.9.3