xieb
2023-12-21 1eef460423fc852ebfa1ff425dc1414d5e147100
留言模块
2 files modified
31 ■■■■ changed files
src/main/java/org/springblade/modules/leave/controller/LeaveWordsController.java 5 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/leave/wrapper/LeaveWordsWrapper.java 26 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/leave/controller/LeaveWordsController.java
@@ -28,7 +28,6 @@
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.assessment.entity.AssessmentScoreEntity;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -81,8 +80,8 @@
        QueryWrapper<LeaveWordsEntity> queryWrapper = Condition.getQueryWrapper(leaveWords, LeaveWordsEntity.class);
//        List<LeaveWordsEntity> list = leaveWordsService.list((!bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID)) ? queryWrapper.lambda().eq(LeaveWordsEntity::getTenantId, bladeUser.getTenantId()) : queryWrapper);
//        List<LeaveWordsEntity> list = leaveWordsService.list(queryWrapper);
        IPage<LeaveWordsEntity> pages = leaveWordsService.page(Condition.getPage(query), Condition.getQueryWrapper(leaveWords, LeaveWordsEntity.class));
        return R.data(LeaveWordsWrapper.build().treeNodePageVO(pages));
        IPage<LeaveWordsEntity> pages = leaveWordsService.page(Condition.getPage(query), Condition.getQueryWrapper(leaveWords, LeaveWordsEntity.class).eq("parent_id", 0));
        return R.data(LeaveWordsWrapper.build().pageVO(pages));
    }
    /**
src/main/java/org/springblade/modules/leave/wrapper/LeaveWordsWrapper.java
@@ -16,12 +16,14 @@
 */
package org.springblade.modules.leave.wrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.springblade.core.mp.support.BaseEntityWrapper;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.modules.assessment.vo.AssessmentScoreVO;
import org.springblade.core.tool.utils.SpringUtil;
import org.springblade.modules.leave.entity.LeaveWordsEntity;
import org.springblade.modules.leave.service.ILeaveWordsService;
import org.springblade.modules.leave.vo.LeaveWordsVO;
import java.util.Objects;
import org.springblade.core.tool.node.ForestNodeMerger;
@@ -35,6 +37,12 @@
 * @since 2023-12-18
 */
public class LeaveWordsWrapper extends BaseEntityWrapper<LeaveWordsEntity, LeaveWordsVO>  {
    private static final ILeaveWordsService leaveWordsService;
    static {
        leaveWordsService = SpringUtil.getBean(ILeaveWordsService.class);
    }
    public static LeaveWordsWrapper build() {
        return new LeaveWordsWrapper();
@@ -65,5 +73,21 @@
        pageVo.setRecords(ForestNodeMerger.merge(collect));
        return pageVo;
    }
    @Override
    public IPage<LeaveWordsVO> pageVO(IPage<LeaveWordsEntity> pages) {
        List<LeaveWordsVO> records = listVO(pages.getRecords());
        for (LeaveWordsVO vo: records) {
            QueryWrapper<LeaveWordsEntity> leaveWordsEntityQueryWrapper = new QueryWrapper<>();
            leaveWordsEntityQueryWrapper.eq("parent_id", vo.getId());
            List<LeaveWordsEntity> entities = leaveWordsService.list(leaveWordsEntityQueryWrapper);
//            vo.setHasChildren(entities.size() > 0);
            if (entities.size() > 0) {
                vo.setChildren(listVO(entities));
            }
        }
        IPage<LeaveWordsVO> pageVo = new Page<>(pages.getCurrent(), pages.getSize(), pages.getTotal());
        pageVo.setRecords(records);
        return pageVo;
    }
}