|
|
|
@ -20,11 +20,9 @@ import cn.hutool.core.collection.CollUtil;
|
|
|
|
|
import cn.hutool.core.convert.Convert;
|
|
|
|
|
import cn.hutool.core.date.DateTime;
|
|
|
|
|
import cn.hutool.core.date.DateUtil;
|
|
|
|
|
import cn.hutool.core.text.CharSequenceUtil;
|
|
|
|
|
import cn.hutool.core.text.StrPool;
|
|
|
|
|
import cn.hutool.core.util.IdUtil;
|
|
|
|
|
import cn.hutool.core.util.NumberUtil;
|
|
|
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
|
|
|
import cn.hutool.core.util.RandomUtil;
|
|
|
|
|
import cn.hutool.core.util.*;
|
|
|
|
|
import com.baiye.config.BusinessConfig;
|
|
|
|
|
import com.baiye.config.properties.FileProperties;
|
|
|
|
|
import com.baiye.constant.DefaultNumberConstants;
|
|
|
|
@ -53,6 +51,7 @@ import com.baiye.modules.system.repository.UserRepository;
|
|
|
|
|
import com.baiye.modules.system.service.UserService;
|
|
|
|
|
import com.baiye.modules.telemarkting.service.ExtensionNumberService;
|
|
|
|
|
import com.baiye.util.*;
|
|
|
|
|
import com.baiye.util.PageUtil;
|
|
|
|
|
import com.google.common.collect.ImmutableMap;
|
|
|
|
|
import com.google.common.collect.Lists;
|
|
|
|
|
import com.google.common.collect.Maps;
|
|
|
|
@ -379,7 +378,7 @@ public class UserServiceImpl implements UserService {
|
|
|
|
|
public Object queryAll(UserQueryCriteria criteria, Pageable pageable) {
|
|
|
|
|
Page<User> page = userRepository.
|
|
|
|
|
findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root, criteria, criteriaBuilder), pageable);
|
|
|
|
|
|
|
|
|
|
page.getContent().forEach(user -> user.setPassword(CharSequenceUtil.EMPTY));
|
|
|
|
|
return PageUtil.toPage(page.map(userMapper::toDto));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|