库存报表、空数据，展示数据纠正

sgj

2026-01-20 a3944579c02f3f12507696e02066727b67bf7ad0

 fzzy-igdss-core/src/main/java/com/fzzy/igds/service/DepotConfService.java

@@ -2,15 +2,17 @@

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.fzzy.igds.constant.Constant;
import com.fzzy.igds.constant.RedisConst;
import com.fzzy.igds.domain.Depot;
import com.fzzy.igds.domain.DepotConf;
import com.fzzy.igds.mapper.DepotConfMapper;
import com.fzzy.igds.utils.ContextUtil;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.utils.StringUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Collection;
@@ -30,8 +32,6 @@
    @Resource
    private DepotConfMapper depotConfMapper;
    @Resource
    private DepotService depotService;
    @Resource
    private RedisCache redisCache;

    /**
@@ -49,9 +49,50 @@
        QueryWrapper<DepotConf> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("company_id", companyId);

        if(StringUtils.isNotBlank(deptId)){
        if (StringUtils.isNotBlank(deptId)) {
            queryWrapper.eq("dept_id", deptId);
        }
        return depotConfMapper.selectList(queryWrapper);
    }

    /**
     * 根据用户类型查询配置信息
     * @return
     */
    public List<DepotConf> getConfListByUserType() {
        //获取当前登录人
        SysUser user = ContextUtil.getLoginUser();

        QueryWrapper<DepotConf> queryWrapper = new QueryWrapper<>();


        //监管用户-默认查看所有信息不增加条件
        if (Constant.USER_TYPE_10.equals(user.getUserType())) {
            queryWrapper.eq("company_id", user.getCompanyId());
            //不增加条件
        }

        //库区用户，如果是公司用户可以查看公司下属所有库区，如果为当前库区只查询当前库区
        if (Constant.USER_TYPE_30.equals(user.getUserType())) {
           queryWrapper.eq("company_id", user.getCompanyId());
        	
            if (ContextUtil.isDepotUser(user.getDeptId() + "")) {
                queryWrapper.eq("dept_id", user.getDeptId() + "");
            } else {
                queryWrapper.likeRight("dept_id", user.getDeptId() + "");
            }
        }

        //银行用户，根据合同查询银行下所有库区
        if (Constant.USER_TYPE_20.equals(user.getUserType())) {

            if(StringUtils.isBlank(user.getUserData())) return null;

            queryWrapper.eq("d.company_id", user.getCompanyId());
            queryWrapper.eq("c.pledge_bank", user.getUserData());
            return depotConfMapper.selectByBank(queryWrapper);
        }

        return depotConfMapper.selectList(queryWrapper);
    }

@@ -75,7 +116,7 @@
            conf.setUpdateBy(ContextUtil.getLoginUserName());
            conf.setUpdateTime(new Date());
            depotConfMapper.insert(conf);
        }else {
        } else {
            conf.setUpdateBy(ContextUtil.getLoginUserName());
            conf.setUpdateTime(new Date());
            depotConfMapper.update(conf, new UpdateWrapper<DepotConf>().eq("depot_id", conf.getDepotId()));
@@ -90,7 +131,7 @@
     * @return
     */
    public void deleteDepotConf(DepotConf conf) {
        depotConfMapper.deleteById( conf);
        depotConfMapper.deleteById(conf);

        //删除配置缓存
        this.delCacheDepotConf(conf, conf.getCompanyId());
@@ -233,7 +274,9 @@
     */
    public void updateFreq(String freq) {
        UpdateWrapper<DepotConf> updateWrapper = new UpdateWrapper<>();
        updateWrapper.eq("dept_id", ContextUtil.subDeptId(null)).set("pos_x", freq);
        updateWrapper.eq("dept_id", ContextUtil.subDeptId(null)).set("grain_freq", freq);
        depotConfMapper.update(null, updateWrapper);
    }


}