bug修改

xuhy

2025-04-27 5fa6e6f8410ef9d057174bcff2a3c5038c54a551

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TCheckAcceptRecordServiceImpl.java

@@ -1,8 +1,11 @@
package com.ruoyi.system.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.constant.DictConstants;
import com.ruoyi.common.utils.DictUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.system.mapper.TCheckAcceptRecordMapper;
import com.ruoyi.system.mapper.TContractMapper;
import com.ruoyi.system.mapper.THouseMapper;
@@ -12,8 +15,6 @@
import com.ruoyi.system.query.TCheckAcceptRecordAppletQuery;
import com.ruoyi.system.query.TCheckAcceptRecordQuery;
import com.ruoyi.system.service.TCheckAcceptRecordService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.system.vo.SysUserVO;
import com.ruoyi.system.vo.TCheckAcceptRecordVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -39,6 +40,8 @@
    @Override
    public PageInfo<TCheckAcceptRecordVO> pageList(TCheckAcceptRecordQuery query) {
        PageInfo<TCheckAcceptRecordVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
        String businessDeptId = SecurityUtils.getBusinessDeptId();
        query.setBusinessDeptId(businessDeptId);
        List<TCheckAcceptRecordVO> list = this.baseMapper.pageList(query,pageInfo);
        list.forEach(item -> {
            item.setCleanSituation(StringUtils.hasLength(item.getCleanSituation()) ?(DictUtils.getDictLabel(DictConstants.DICT_TYPE_CHECK_SITUATION,item.getCleanSituation())):"");
@@ -53,8 +56,9 @@

    @Override
    public PageInfo<TCheckAcceptRecordVO> pageListApplet(TCheckAcceptRecordAppletQuery query) {
        List<TContract> tContracts = contractMapper.selectList(null);
        List<THouse> tHouses = houseMapper.selectList(null);
        String businessDeptId = query.getBusinessDeptId();
        List<TContract> tContracts = contractMapper.selectList(new LambdaQueryWrapper<TContract>().eq(StringUtils.hasLength(businessDeptId) && !"0".equals(businessDeptId),TContract::getBusinessDeptId,businessDeptId));
        List<THouse> tHouses = houseMapper.selectList(new LambdaQueryWrapper<THouse>().eq(StringUtils.hasLength(businessDeptId) && !"0".equals(businessDeptId),THouse::getBusinessDeptId,businessDeptId));
        PageInfo<TCheckAcceptRecordVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
        List<TCheckAcceptRecordVO> list = this.baseMapper.pageListApplet(query,pageInfo);
        list.forEach(item -> {