Merge remote-tracking branch 'origin/master'

lin

2024-03-25 9f8f9d13c42ca8cdccbf351069082a5fdccef2e4

 src/main/java/org/springblade/modules/discuss/controller/UserPublicEnrollController.java

@@ -114,8 +114,7 @@
      // 一户一票
      if (one.getVoteRestrictions().equals(CommonConstant.NUMBER_ONE)) {
         long count = userPublicEnrollService.count(Wrappers.<UserPublicEnrollEntity>lambdaQuery()
            .eq(UserPublicEnrollEntity::getPublicDiscussId, userPublicEnroll.getPublicDiscussId())
            .eq(UserPublicEnrollEntity::getUserId, userPublicEnroll.getUserId())
            .eq(UserPublicEnrollEntity::getArticleId, userPublicEnroll.getArticleId())
            .eq(UserPublicEnrollEntity::getHouseCode, userPublicEnroll.getHouseCode()));
         if (count > 0) {
            return R.fail("您房屋已经报名，不能重复报名！");
@@ -123,7 +122,7 @@
         // 一人一票
      } else {
         long count = userPublicEnrollService.count(Wrappers.<UserPublicEnrollEntity>lambdaQuery()
            .eq(UserPublicEnrollEntity::getPublicDiscussId, userPublicEnroll.getPublicDiscussId())
            .eq(UserPublicEnrollEntity::getArticleId, userPublicEnroll.getArticleId())
            .eq(UserPublicEnrollEntity::getUserId, userPublicEnroll.getUserId()));
         if (count > 0) {
            return R.fail("您已报名，不能重复报名！");