仓库查询过滤优化

czt

2025-12-22 d6e33e1daa6118dd6e799907eb3d8bc312f785b8

仓库查询过滤优化

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

@@ -59,8 +59,7 @@
     */
    public List<Dept> getDeptData() {
        SysUser user = ContextUtil.getLoginUser();
        SysDept userDept = iSysDeptService.selectDeptById(user.getDeptId());
        if (Constant.DEPT_TYPE_20.equals(userDept.getType())) {
        if (Constant.USER_TYPE_30.equals(user.getUserType())) {
            return this.listDept(ContextUtil.subDeptId(user),null,null);
        }else {
            return this.listDept(null,null,user.getDeptId() + "%");

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

@@ -43,7 +43,7 @@
        QueryWrapper<Depot> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("company_id", companyId);
        if(StringUtils.isNotBlank(deptId)){
            queryWrapper.eq("dept_id", deptId);
            queryWrapper.likeRight("dept_id", deptId);
        }
        
        if(idDesc){

 fzzy-igdss-view/src/main/java/com/fzzy/igds/Depot.view.xml

@@ -99,54 +99,48 @@
        <DataColumn name="id">
          <Property name="property">id</Property>
          <Property name="align">center</Property>
          <Property name="width">160</Property>
          <Property name="width">120</Property>
        </DataColumn>
        <DataColumn name="name">
          <Property name="property">name</Property>
          <Property name="align">center</Property>
          <Property name="width">120</Property>
        </DataColumn>
        <DataColumn name="deptId">
          <Property name="property">deptId</Property>
          <Property name="align">left</Property>
        </DataColumn>
        <DataColumn name="depotStatus">
          <Property name="property">depotStatus</Property>
          <Property name="align">center</Property>
          <Property name="width">100</Property>
        </DataColumn>
        <DataColumn name="foodVariety">
          <Property name="property">foodVariety</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="foodType">
          <Property name="property">foodType</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="foodLevel">
          <Property name="property">foodLevel</Property>
          <Property name="align">center</Property>
          <Property name="width">120</Property>
        </DataColumn>
        <DataColumn name="storageReal">
          <Property name="property">storageReal</Property>
          <Property name="align">center</Property>
          <Property name="width">150</Property>
        </DataColumn>
        <DataColumn name="foodYear">
          <Property name="property">foodYear</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="foodLocation">
          <Property name="property">foodLocation</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="storeDate">
          <Property name="property">storeDate</Property>
          <Property name="align">center</Property>
          <Property name="width">100</Property>
        </DataColumn>
        <DataColumn name="storeKeeperName">
          <Property name="property">storeKeeperName</Property>
          <Property name="align">center</Property>
          <Property name="width">100</Property>
        </DataColumn>
        <DataColumn name="depotType">
          <Property name="property">depotType</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="updateBy">
          <Property name="property">updateBy</Property>
          <Property name="align">center</Property>
          <Property name="width">100</Property>
        </DataColumn>

 fzzy-igdss-view/src/main/java/com/fzzy/igds/SelectDeptPR.java

@@ -1,6 +1,7 @@
package com.fzzy.igds;

import com.bstek.dorado.annotation.DataProvider;
import com.fzzy.igds.constant.Constant;
import com.fzzy.igds.domain.Company;
import com.fzzy.igds.domain.Dept;
import com.fzzy.igds.service.CoreCompanyService;
@@ -37,12 +38,12 @@
        //获取当前登录人
        SysUser user = ContextUtil.getLoginUser();

        if(FrameworkConfig.getCompanyId().equals(user.getCompanyId())){
            //系统监管账号，获取组织下所有公司信息
            return companyService.listCompany(null, user.getCompanyId(), null);
        }else {
        if (Constant.USER_TYPE_30.equals(user.getUserType())) {
            //收储公司账号，只获取当前公司信息
            return companyService.listCompany(user.getCompanyId(), null, null);
        }else {
            //系统监管账号，获取组织下所有公司信息
            return companyService.listCompany(null, user.getCompanyId(), null);
        }
    }