|  | @@ -252,7 +252,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
 | 
											
												
													
														|  |      @Override
 |  |      @Override
 | 
											
												
													
														|  |      public Map<Long, UserDTO> userCondition(Long userId, Long channelId, String userName, String nickname, String regIp) {
 |  |      public Map<Long, UserDTO> userCondition(Long userId, Long channelId, String userName, String nickname, String regIp) {
 | 
											
												
													
														|  |          //用户信息条件处理
 |  |          //用户信息条件处理
 | 
											
												
													
														|  | -        if (userId == null && channelId == null && Strings.isBlank(userName) && Strings.isBlank(nickname)) {
 |  | 
 | 
											
												
													
														|  | 
 |  | +        if (userId == null && channelId == null && Strings.isBlank(userName) && Strings.isBlank(nickname) && Strings.isBlank(regIp)) {
 | 
											
												
													
														|  |              return null;
 |  |              return null;
 | 
											
												
													
														|  |          }
 |  |          }
 | 
											
												
													
														|  |          //查询
 |  |          //查询
 | 
											
										
											
												
													
														|  | @@ -262,7 +262,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
 | 
											
												
													
														|  |                  .eq(Strings.isNotBlank(regIp), User::getIp, regIp)
 |  |                  .eq(Strings.isNotBlank(regIp), User::getIp, regIp)
 | 
											
												
													
														|  |                  .like(Strings.isNotBlank(userName), User::getUsername, userName)
 |  |                  .like(Strings.isNotBlank(userName), User::getUsername, userName)
 | 
											
												
													
														|  |                  .like(Strings.isNotBlank(nickname), User::getNickname, nickname)
 |  |                  .like(Strings.isNotBlank(nickname), User::getNickname, nickname)
 | 
											
												
													
														|  | -                .select(User::getId, User::getUsername, User::getNickname, User::getIp));
 |  | 
 | 
											
												
													
														|  | 
 |  | +                .select(User::getId, User::getUsername, User::getNickname, User::getIp, User::getCreateTime, User::getAgentId));
 | 
											
												
													
														|  |          if (CollectionUtils.isEmpty(userList)) {
 |  |          if (CollectionUtils.isEmpty(userList)) {
 | 
											
												
													
														|  |              return Collections.emptyMap();
 |  |              return Collections.emptyMap();
 | 
											
												
													
														|  |          }
 |  |          }
 |