优化备注

src/main/java/cn/meteor/beyondclouds/modules/user/service/impl/UserRemarksServiceImpl.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
 
 
 /**
 /**
  * <p>
  * <p>
@@ -21,27 +22,33 @@ public class UserRemarksServiceImpl extends ServiceImpl<UserRemarksMapper, UserR
 
 
     @Override
     @Override
     public void alterRemarks(String currentUserId, String userId, String remarks) {
     public void alterRemarks(String currentUserId, String userId, String remarks) {
+
         QueryWrapper queryWrapper = new QueryWrapper();
         QueryWrapper queryWrapper = new QueryWrapper();
         queryWrapper.eq("user_id", currentUserId);
         queryWrapper.eq("user_id", currentUserId);
         queryWrapper.eq("marked_id", userId);
         queryWrapper.eq("marked_id", userId);
-        UserRemarks result = getOne(queryWrapper);
 
 
-        if(null == remarks){
-            remarks = "";
+        // 如果传入的昵称是空的，则删除备注
+        if (StringUtils.isEmpty(remarks)) {
+            remove(queryWrapper);
+            return;
         }
         }
-        if(null == result){
-            UserRemarks userRemarks = new UserRemarks();
+
+        // 从数据库查询备注信息
+        UserRemarks userRemarks = getOne(queryWrapper);
+
+        if(null == remarks){
+            // 如果以前没有记录，则新增一条
+            userRemarks = new UserRemarks();
             userRemarks.setUserId(currentUserId);
             userRemarks.setUserId(currentUserId);
             userRemarks.setMarkedId(userId);
             userRemarks.setMarkedId(userId);
             userRemarks.setRemarks(remarks);
             userRemarks.setRemarks(remarks);
             save(userRemarks);
             save(userRemarks);
+
+        } else {
+            // 否则直接更新即可
+            userRemarks.setRemarks(remarks);
+            updateById(userRemarks);
         }
         }
-        if(null != result){
-            UpdateWrapper updateWrapper = new UpdateWrapper();
-            updateWrapper.eq("user_id", currentUserId);
-            updateWrapper.eq("marked_id", userId);
-            updateWrapper.set("remarks", remarks);
-            update(updateWrapper);
-        }
+
     }
     }
 }
 }