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<Category>().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<User> 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<Void> 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();
     }