2023年6月19日08:41:02

blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java

@@ -380,6 +380,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
 		boolean oauthTemp = userOauthService.updateById(userOauth);
 		return (userTemp && oauthTemp);
 	}
+
 	@Override
 	public boolean updatePlatform(Long userId, Integer userType, String userExt) {
 		if (userType.equals(UserEnum.WEB.getCategory())) {
@@ -440,7 +441,11 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
 
 	@Override
 	public List<Map<String, Object>> gainUser(String tenantId) {
-		return baseMapper.gainUser(tenantId,AuthUtil.getDeptId());
+		if ("681169".equals(AuthUtil.getTenantId())) {
+			return baseMapper.gainUser(tenantId, null);
+		} else {
+			return baseMapper.gainUser(tenantId, AuthUtil.getDeptId());
+		}
 	}
 
 	@Override
@@ -455,8 +460,10 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
 	 * @return
 	 */
 	@Override
-	public List<User> selectUserIds(String userIds){
-		if (StringUtils.isBlank(userIds)) {return Collections.emptyList();}
+	public List<User> selectUserIds(String userIds) {
+		if (StringUtils.isBlank(userIds)) {
+			return Collections.emptyList();
+		}
 
 		List<Long> collect = Arrays.stream(userIds.split(","))
 			.map(s -> Long.parseLong(s.trim()))