From 2da344e8e56acc8468d5d6d8100a1305acd0f40e Mon Sep 17 00:00:00 2001 From: lhd <839347550@qq.com> Date: Thu, 10 Oct 2024 11:08:31 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=88=A4=E6=96=AD=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/yami/shop/admin/controller/CategoryController.java | 2 +- .../java/com/yami/shop/admin/controller/UserController.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/CategoryController.java b/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/CategoryController.java index 2a11ad5..93d4e5d 100644 --- a/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/CategoryController.java +++ b/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/CategoryController.java @@ -72,7 +72,7 @@ public class CategoryController { category.setRecTime(new Date()); Category categoryName = categoryService.getOne(new LambdaQueryWrapper().eq(Category::getCategoryName,category.getCategoryName()) .eq(Category::getShopId,category.getShopId())); - if(categoryName != null){ + if(Objects.nonNull(categoryName)){ throw new YamiShopBindException("类目名称已存在！"); } categoryService.saveCategory(category); diff --git a/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/UserController.java b/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/UserController.java index d33bbc4..a61e5f6 100644 --- a/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/UserController.java +++ b/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/UserController.java @@ -45,7 +45,7 @@ public class UserController { .like(StrUtil.isNotBlank(user.getNickName()), User::getNickName, user.getNickName()) .eq(user.getStatus() != null, User::getStatus, user.getStatus())); for (User userResult : userPage.getRecords()) { - userResult.setNickName(userResult.getNickName() == null ? "" : userResult.getNickName()); + userResult.setNickName(StrUtil.isBlank(userResult.getNickName()) ? "" : userResult.getNickName()); } return ServerResponseEntity.success(userPage); } @@ -57,7 +57,7 @@ public class UserController { @PreAuthorize("@pms.hasPermission('admin:user:info')") public ServerResponseEntity info(@PathVariable("userId") String userId) { User user = userService.getById(userId); - user.setNickName(user.getNickName() == null ? "" : user.getNickName()); + user.setNickName(StrUtil.isBlank(user.getNickName()) ? "" : user.getNickName()); return ServerResponseEntity.success(user); } @@ -68,7 +68,7 @@ public class UserController { @PreAuthorize("@pms.hasPermission('admin:user:update')") public ServerResponseEntity update(@RequestBody User user) { user.setModifyTime(new Date()); - user.setNickName(user.getNickName() == null ? "" : user.getNickName()); + user.setNickName(StrUtil.isBlank(user.getNickName()) ? "" : user.getNickName()); userService.updateById(user); return ServerResponseEntity.success(); }