|
|
@@ -33,6 +33,7 @@ import com.uas.sso.exception.AccountException;
|
|
|
import javax.persistence.criteria.*;
|
|
|
import java.sql.Timestamp;
|
|
|
import java.util.ArrayList;
|
|
|
+import java.util.Iterator;
|
|
|
import java.util.List;
|
|
|
import java.util.Set;
|
|
|
|
|
|
@@ -504,7 +505,32 @@ public class UserServiceImpl implements UserService {
|
|
|
|
|
|
@Override
|
|
|
public List<UserSpaceDetailInfo> findUserByTels(List<String> tels) {
|
|
|
- return userDao.findUsersByTels(tels);
|
|
|
+ // 获取用户列表
|
|
|
+ List<User> users = userDao.findUsersByTels(tels);
|
|
|
+ if (CollectionUtils.isEmpty(users)) {
|
|
|
+ return null;
|
|
|
+ }
|
|
|
+
|
|
|
+ List<UserSpaceDetailInfo> data = new ArrayList<>(users.size());
|
|
|
+ UserSpaceDetailInfo info;
|
|
|
+ // 遍历用户列表取数据
|
|
|
+ for (User user : users) {
|
|
|
+ info = new UserSpaceDetailInfo();
|
|
|
+ Set<Userspace> spaces = user.getUserSpaces();
|
|
|
+ if (!CollectionUtils.isEmpty(spaces)) {
|
|
|
+ // 有企业的话随便取一个,uu互联需求
|
|
|
+ Iterator<Userspace> iterator = spaces.iterator();
|
|
|
+ Userspace userspace = iterator.next();
|
|
|
+ info.setAddress(userspace.getRegAddress());
|
|
|
+ info.setCompany(userspace.getSpaceName());
|
|
|
+ }
|
|
|
+ info.setEmail(user.getEmail());
|
|
|
+ info.setImid(user.getImId());
|
|
|
+ info.setUsertel(user.getMobile());
|
|
|
+ info.setUsername(user.getVipName());
|
|
|
+ data.add(info);
|
|
|
+ }
|
|
|
+ return data;
|
|
|
}
|
|
|
|
|
|
/**
|