lin
2024-03-27 27e5e0716b9e576100515058fd589cd98bd9bb72
校验
3 files modified
27 ■■■■■ changed files
src/main/java/org/springblade/modules/discuss/service/impl/PublicDiscussServiceImpl.java 23 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/discuss/service/impl/UserTopicsServiceImpl.java 2 ●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/discuss/vo/PublicDiscussVO.java 2 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/discuss/service/impl/PublicDiscussServiceImpl.java
@@ -19,6 +19,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springblade.common.constant.CommonConstant;
import org.springblade.common.utils.SpringUtils;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
@@ -87,6 +88,26 @@
        if (householdEntity != null) {
            publicDiscuss.setHouseholdId(householdEntity.getId());
        }
        return baseMapper.selectPublicDiscuss(publicDiscuss);
        PublicDiscussVO publicDiscussVO = baseMapper.selectPublicDiscuss(publicDiscuss);
        publicDiscussVO.setDisabled(false);
        // 一户一票
        IUserTopicsService bean = SpringUtils.getBean(IUserTopicsService.class);
        if (publicDiscussVO.getVoteRestrictions().equals(CommonConstant.NUMBER_ONE)) {
            long count = bean.count(Wrappers.<UserTopicsEntity>lambdaQuery()
                .eq(UserTopicsEntity::getHouseCode, publicDiscuss.getHouseCode())
                .eq(UserTopicsEntity::getArticleId, publicDiscussVO.getArticleId()));
            if (count > 0) {
                publicDiscussVO.setDisabled(true);
            }
        } else {
            // 一个一票
            long count = bean.count(Wrappers.<UserTopicsEntity>lambdaQuery()
                .eq(UserTopicsEntity::getHouseholdId, householdEntity.getId())
                .eq(UserTopicsEntity::getArticleId, publicDiscussVO.getArticleId()));
            if (count > 0) {
                publicDiscussVO.setDisabled(true);
            }
        }
        return publicDiscussVO;
    }
}
src/main/java/org/springblade/modules/discuss/service/impl/UserTopicsServiceImpl.java
@@ -128,7 +128,7 @@
                }
                if (topic.getOptionNumber() > 1) {
                    JSONArray objects1 = JSON.parseArray(topic.getSelected());
                    if (objects1.size() <= topic.getOptionNumber()) {
                    if (objects1.size() > topic.getOptionNumber()) {
                        return topic.getDiscussContent() + ":议题最多需要选择" + topic.getOptionNumber() + "项";
                    }
                }
src/main/java/org/springblade/modules/discuss/vo/PublicDiscussVO.java
@@ -41,4 +41,6 @@
    private String houseCode;
    private Boolean disabled;
}