From 595d90260011887a3031ceef2de984e8b908250b Mon Sep 17 00:00:00 2001 From: bynt Date: Wed, 15 Mar 2023 10:47:55 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E5=AF=86=E7=A0=81=E7=BD=AE=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../baiye/modules/system/controller/UserController.java | 2 +- .../modules/system/service/impl/UserServiceImpl.java | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/system/controller/UserController.java b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/system/controller/UserController.java index 78a78503..67e2c994 100644 --- a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/system/controller/UserController.java +++ b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/system/controller/UserController.java @@ -128,7 +128,7 @@ public class UserController { @ApiOperation("查询用户") @GetMapping - @PreAuthorize("@el.check('task:source')") + @PreAuthorize("@el.check('user:list')") public ResponseEntity query(UserQueryCriteria criteria, Pageable pageable) { UserDto userDto = JSONUtil.toBean(SecurityUtils.getUser(), UserDto.class); if (userDto != null) { diff --git a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/UserServiceImpl.java b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/UserServiceImpl.java index eb152177..06475173 100644 --- a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/UserServiceImpl.java +++ b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/UserServiceImpl.java @@ -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 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)); }