Merge remote-tracking branch 'origin/master'

lin

2024-03-25 9f8f9d13c42ca8cdccbf351069082a5fdccef2e4

 src/main/java/org/springblade/modules/discuss/service/impl/UserTopicsServiceImpl.java

@@ -96,17 +96,18 @@
            .eq(UserTopicsEntity::getUserId, AuthUtil.getUserId())
            .eq(UserTopicsEntity::getArticleId, topics.get(0).getArticleId()));
         if (count > 0) {
            return "您的已投票，不能重复投票！";
            return "您已投票，不能重复投票！";
         }
      }
      Boolean userTopics = getaBoolean(topics);
      if (userTopics != null) return "200";
      if (userTopics) return "200";
      return "操作失败！";
   }

   @Nullable
   private Boolean getaBoolean(List<TopicsVO> topics) {
      List<UserTopicsEntity> objects = new ArrayList<>();
      Boolean result = false;
      for (TopicsVO topic : topics) {
         UserTopicsEntity userTopicsEntity = new UserTopicsEntity();
         userTopicsEntity.setUserId(AuthUtil.getUserId());
@@ -131,7 +132,7 @@
            objectUpdateWrapper.setSql("number = number + 1");
            objectUpdateWrapper.eq("id", topic.getSelected());
            topicsService.update(null, objectUpdateWrapper);
            return save(userTopics);
            result = save(userTopics);
         } else {
            // 多选
            if (StringUtils.isBlank(topic.getSelected())) {
@@ -154,10 +155,10 @@
               objectUpdateWrapper.eq("id", o);
               topicsService.update(null, objectUpdateWrapper);
            }
            return saveBatch(objectsTwo);
            result = saveBatch(objectsTwo);
         }
      }
      return null;
      return result;
   }