权限修改

hx-account/src/main/java/com/fjhx/account/entity/account/dto/AccountManagementSelectDto.java

@@ -24,4 +24,9 @@ public class AccountManagementSelectDto extends BaseSelectDto {
      * 开户银行
      */
     private String openingBank;
+
+    /**
+     * 生产公司id
+     */
+    private Long companyId;
 }

hx-account/src/main/java/com/fjhx/account/entity/account/dto/AccountRequestFundsSelectDto.java

@@ -135,4 +135,9 @@ public class AccountRequestFundsSelectDto extends BaseSelectDto {
      */
     private String oppositeAccountName;
 
+    /**
+     * 生产公司id
+     */
+    private Long companyId;
+
 }

hx-account/src/main/java/com/fjhx/account/entity/transaction/dto/TransactionDepartmentSelectDto.java

@@ -14,4 +14,9 @@ import lombok.Setter;
 @Setter
 public class TransactionDepartmentSelectDto extends BaseSelectDto {
 
+    /**
+     * 生产公司id
+     */
+    private Long companyId;
+
 }

hx-account/src/main/java/com/fjhx/account/entity/transaction/dto/TransactionSelectDto.java

@@ -28,4 +28,9 @@ public class TransactionSelectDto extends BaseSelectDto {
      */
     private Integer type;
 
+    /**
+     * 生产公司id
+     */
+    private Long companyId;
+
 }

hx-account/src/main/java/com/fjhx/account/entity/write/dto/WriteOffRecordsSelectDto.java

@@ -24,4 +24,9 @@ public class WriteOffRecordsSelectDto extends BaseSelectDto {
      */
     private Integer type;
 
+    /**
+     * 生产公司id
+     */
+    private Long companyId;
+
 }

hx-account/src/main/java/com/fjhx/account/service/account/impl/AccountManagementServiceImpl.java

@@ -78,7 +78,8 @@ public class AccountManagementServiceImpl extends ServiceImpl<AccountManagementM
         }
 
         //权限过滤：资金账户
-        wrapper.eq(AccountManagement::getCompanyId, SecurityUtils.getCompanyId());
+        wrapper.in(AccountManagement::getCompanyId, SecurityUtils.getCompanyIds());
+        wrapper.eq(AccountManagement::getCompanyId, dto.getCompanyId());
 
         Page<AccountManagementVo> page = baseMapper.getPage(dto.getPage(), wrapper);
         List<AccountManagementVo> records = page.getRecords();

hx-account/src/main/java/com/fjhx/account/service/account/impl/AccountPaymentServiceImpl.java

@@ -98,7 +98,8 @@ public class AccountPaymentServiceImpl extends ServiceImpl<AccountPaymentMapper,
         wrapper.like(ObjectUtil.isNotEmpty(dto.getOppositeAccountName()), "ap.name", dto.getOppositeAccountName());
 
         //权限过滤：打款-子公司看自己的
-        wrapper.eq("ap.company_id", SecurityUtils.getCompanyId());
+        wrapper.in("ap.company_id", SecurityUtils.getCompanyIds());
+        wrapper.eq("ap.company_id", dto.getCompanyId());
 
 
         Page<AccountPaymentVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);

hx-account/src/main/java/com/fjhx/account/service/account/impl/AccountRequestFundsServiceImpl.java

@@ -40,7 +40,6 @@ import org.springframework.stereotype.Service;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-import java.util.Set;
 import java.util.stream.Collectors;
 
 
@@ -94,27 +93,11 @@ public class AccountRequestFundsServiceImpl extends ServiceImpl<AccountRequestFu
         wrapper.orderByAsc("case arf.status when 10 then 1 when 30 then 2 else 3 END");
         // 同状态按发起时间倒序排序
         wrapper.orderByDesc("arf.create_time");
-        //-----------------------------------------------------------------------
-        //添加权限过滤
-        DynamicDataSourceContextHolder.push(SourceConstant.BASE);
-        Set<String> permissionList = sysRoleService.selectRolePermissionByUserId(SecurityUtils.getUserId());
-        DynamicDataSourceContextHolder.poll();
-        if (ObjectUtil.isNotEmpty(permissionList)) {
-            //if in[总经理、财务主管、出纳、实习出纳]可查看所有数据else只能看自己的
-            if (!permissionList.contains("ceo")
-                    && !permissionList.contains("financeOfficer")
-                    && !permissionList.contains("cashier")
-                    && !permissionList.contains("Intern_cashier")
-                    && !permissionList.contains("admin")//管理员
-            ) {
-                // 添加权限自己看自己
-                wrapper.eq("arf.create_user", SecurityUtils.getUserId());
-            }
-        }
-        //-----------------------------------------------------------------------
+
 
         //权限过滤：请款-子公司看自己的
-        wrapper.eq("arf.company_id", SecurityUtils.getCompanyId());
+        wrapper.in("arf.company_id", SecurityUtils.getCompanyIds());
+        wrapper.eq("arf.company_id", dto.getCompanyId());
 
 
         // 归属公司

hx-account/src/main/java/com/fjhx/account/service/account/impl/AccountRunningWaterServiceImpl.java

@@ -129,13 +129,10 @@ public class AccountRunningWaterServiceImpl extends ServiceImpl<AccountRunningWa
             }
         }
 
-        //权限过滤：生产备料-子公司看自己的,总公司看全部
-        Long companyId = SecurityUtils.getCompanyId();
-        if (!Objects.equals(companyId, 100L)) {
-            wrapper.eq("arw.company_id", companyId);
-        } else {
-            wrapper.eq(ObjectUtil.isNotEmpty(dto.getCompanyId()), "arw.company_id", dto.getCompanyId());
-        }
+        //权限过滤：生产备料
+        wrapper.in("arw.company_id", SecurityUtils.getCompanyIds());
+        wrapper.eq(ObjectUtil.isNotEmpty(dto.getCompanyId()), "arw.company_id", dto.getCompanyId());
+
 
         return wrapper;
     }

hx-account/src/main/java/com/fjhx/account/service/transaction/impl/TransactionDepartmentServiceImpl.java

@@ -37,7 +37,9 @@ public class TransactionDepartmentServiceImpl extends ServiceImpl<TransactionDep
         wrapper.orderByDesc("td", TransactionDepartment::getId);
 
         //权限过滤：往来管理
-        wrapper.eq("td", TransactionDepartment::getCompanyId, SecurityUtils.getCompanyId());
+        wrapper.in("td", TransactionDepartment::getCompanyId, SecurityUtils.getCompanyIds());
+        wrapper.eq("td", TransactionDepartment::getCompanyId, dto.getCompanyId());
+
 
         Page<TransactionDepartmentVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
         return page;

hx-account/src/main/java/com/fjhx/account/service/transaction/impl/TransactionServiceImpl.java

@@ -58,7 +58,8 @@ public class TransactionServiceImpl extends ServiceImpl<TransactionMapper, Trans
 
 
         //权限过滤：往来管理
-        wrapper.eq("t", Transaction::getCompanyId, SecurityUtils.getCompanyId());
+        wrapper.in("t", Transaction::getCompanyId, SecurityUtils.getCompanyIds());
+        wrapper.eq("t", Transaction::getCompanyId, dto.getCompanyId());
 
 
         Page<TransactionVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);

hx-account/src/main/java/com/fjhx/account/service/write/impl/WriteOffRecordsServiceImpl.java

@@ -57,7 +57,8 @@ public class WriteOffRecordsServiceImpl extends ServiceImpl<WriteOffRecordsMappe
         wrapper.eq("ap.type", dto.getType());
 
         //权限过滤：冲销记录
-        wrapper.eq("wor.company_id", SecurityUtils.getCompanyId());
+        wrapper.in("wor.company_id", SecurityUtils.getCompanyIds());
+        wrapper.eq("wor.company_id", dto.getCompanyId());
 
         wrapper.orderByDesc("wor", WriteOffRecords::getId);
         Page<WriteOffRecordsVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);

hx-common/src/main/java/com/fjhx/common/service/contract/impl/ContractTemplateServiceImpl.java

@@ -17,7 +17,6 @@ import org.springframework.stereotype.Service;
 
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 import java.util.stream.Collectors;
 
 
@@ -40,13 +39,10 @@ public class ContractTemplateServiceImpl extends ServiceImpl<ContractTemplateMap
         //合同类型过滤
         wrapper.eq("ct", ContractTemplate::getTemplateType, dto.getTemplateType());
 
-        //权限过滤：合同模板-子公司看自己的,总公司看全部
-        Long companyId = SecurityUtils.getCompanyId();
-        if (!Objects.equals(companyId, 100L)) {
-            wrapper.eq("ct.company_id", companyId);
-        } else {
-            wrapper.eq("ct.company_id", dto.getCompanyId());
-        }
+        //权限过滤：合同模板
+        wrapper.in("ct.company_id", SecurityUtils.getCompanyIds());
+        wrapper.eq("ct.company_id", dto.getCompanyId());
+
 
         wrapper.orderByDesc("ct", ContractTemplate::getId);
         Page<ContractTemplateVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);

hx-common/src/main/java/com/fjhx/common/service/corporation/impl/CorporationServiceImpl.java

@@ -20,7 +20,6 @@ import org.springframework.stereotype.Service;
 
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 import java.util.stream.Collectors;
 
 
@@ -45,13 +44,10 @@ public class CorporationServiceImpl extends ServiceImpl<CorporationMapper, Corpo
                     .or().like(Corporation::getNameEn, dto.getKeyword()));
         }
 
-        //权限过滤：企业信息配置-子公司看自己的,总公司看全部
-        Long companyId = SecurityUtils.getCompanyId();
-        if (!Objects.equals(companyId, 100L)) {
-            wrapper.eq("c.company_id", companyId);
-        } else {
-            wrapper.eq("c.company_id", dto.getCompanyId());
-        }
+        //权限过滤：企业信息配置
+        wrapper.in("c.company_id", SecurityUtils.getCompanyIds());
+        wrapper.eq("c.company_id", dto.getCompanyId());
+
 
         wrapper.orderByDesc("c", Corporation::getId);
 

hx-form/src/main/java/com/fjhx/form/service/impl/StatisticsServiceImpl.java

@@ -30,7 +30,6 @@ import org.springframework.stereotype.Service;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 
 @Service
 public class StatisticsServiceImpl implements StatisticsService {
@@ -68,15 +67,15 @@ public class StatisticsServiceImpl implements StatisticsService {
 
         //权限过滤：子公司看自己的,总公司看全部
         boolean flag;//是否是总公司
-        Long companyId = SecurityUtils.getCompanyId();
-        if (Objects.equals(companyId, 100L)) {
+        List<Long> companyIds = SecurityUtils.getCompanyIds();
+
+        if (companyIds.contains(100L)) {
             //总公司直接忽略归属公司条件
-            companyId = null;
             flag = true;
         } else {
             flag = false;
         }
-        Long finalCompanyId = companyId;//isEstimate
+        List<Long> finalCompanyIds = companyIds;//isEstimate
 
         //统计待审批数据
         long waitFlowCount = flowExampleService.count(q -> q.in(FlowExample::getStatus, 1, 0).eq(FlowExample::getHandleUserId, userId));
@@ -84,12 +83,12 @@ public class StatisticsServiceImpl implements StatisticsService {
         long waitQuotationCount = saleQuotationService.count(q -> q
                 .ne(!flag, SaleQuotation::getStatus, FlowStatusEnum1.DRAFT.getKey())//子公司
                 .ne(SaleQuotation::getStatus, FlowStatusEnum1.UPDATE.getKey())//总公司
-                .eq(!flag, SaleQuotation::getCompanyId, finalCompanyId)
+                .in(!flag, SaleQuotation::getCompanyId, finalCompanyIds)
         );
         //待投产
         long waitProduceCount = produceOrderService.count(q -> q
                 .isNull(ProductionOrder::getProduceTime)
-                .eq(!flag, ProductionOrder::getCompanyId, finalCompanyId)
+                .in(!flag, ProductionOrder::getCompanyId, finalCompanyIds)
         );
         //待入库
         StockWaitDetailsSelectDto stockWaitDetailsSelectDto = new StockWaitDetailsSelectDto();
@@ -103,7 +102,7 @@ public class StatisticsServiceImpl implements StatisticsService {
         long waitClaimCount = accountRunningWaterService.count(q -> q
                 .eq(AccountRunningWater::getReceived, 10)
                 .eq(AccountRunningWater::getIsClaim, 0)
-                .eq(!flag, AccountRunningWater::getCompanyId, finalCompanyId)
+                .in(!flag, AccountRunningWater::getCompanyId, finalCompanyIds)
         );
         //库存预警-子公司看
         long stockWarnCount = stockService.stockWarningPage(new StockSelectDto()).getTotal();
@@ -171,11 +170,10 @@ public class StatisticsServiceImpl implements StatisticsService {
     public List<ContractVo> getRecentContractShipmentList() {
         IWrapper<Object> wrapper = IWrapper.getWrapper();
 
-        //权限过滤：近期出货合同-子公司看自己的,总公司看全部
-        Long companyId = SecurityUtils.getCompanyId();
-        if (!Objects.equals(companyId, 100L)) {
-            wrapper.eq("c.company_id", companyId);
-        }
+        //权限过滤：近期出货合同
+        wrapper.in("c.company_id", SecurityUtils.getCompanyIds());
+
+
         wrapper.eq("c.status", 30);
         wrapper.ge("DATEDIFF(c.delivery_time,NOW())", 0);
         wrapper.le("DATEDIFF(c.delivery_time,NOW())", 7);
@@ -187,11 +185,9 @@ public class StatisticsServiceImpl implements StatisticsService {
     public List<EhsdPurchaseVo> getRecentPurchaseArrivalList() {
         IWrapper<Object> wrapper = IWrapper.getWrapper();
 
-        //权限过滤：近期出货合同-子公司看自己的,总公司看全部
-        Long companyId = SecurityUtils.getCompanyId();
-        if (!Objects.equals(companyId, 100L)) {
-            wrapper.eq("p.company_id", companyId);
-        }
+        //权限过滤：近期出货合同
+        wrapper.in("p.company_id", SecurityUtils.getCompanyIds());
+
 
         wrapper.ge("DATEDIFF(p.delivery_time,NOW())", 0);
         wrapper.le("DATEDIFF(p.delivery_time,NOW())", 7);

hx-iot/src/main/java/com/fjhx/iot/service/tda/impl/TdaDeviceServiceImpl.java

@@ -48,12 +48,9 @@ public class TdaDeviceServiceImpl extends ServiceImpl<TdaDeviceMapper, TdaDevice
         wrapper.keyword(dto, new SqlField("td.device_name"));
 
         //权限过滤：设备管理-子公司看自己的,总公司看全部
-        Long companyId = SecurityUtils.getCompanyId();
-        if (!Objects.equals(companyId, 100L)) {
-            wrapper.eq("td.company_id", companyId);
-        } else {
-            wrapper.eq("td.company_id", dto.getCompanyId());
-        }
+            wrapper.in("td.company_id", SecurityUtils.getCompanyIds());
+        wrapper.eq("td.company_id", dto.getCompanyId());
+
 
         Page<TdaDeviceVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
 

hx-item/src/main/java/com/fjhx/item/service/product/impl/ProductInfoServiceImpl.java

@@ -204,16 +204,15 @@ public class ProductInfoServiceImpl extends ServiceImpl<ProductInfoMapper, Produ
 
         //没禁用权限过滤的情况
         if (!ObjectUtil.equals(dto.getDisablePerm(), 1)) {
-            //权限过滤：产品-子公司看自己的产品，总公司看全部，物料没有限制
-            Long companyId = SecurityUtils.getCompanyId();
-            if (!Objects.equals(companyId, 100L)) {
-                dto.setCompanyId(companyId);
-            }
+            //权限过滤：产品
+            wrapper.and(q1 -> q1.
+                    and(q -> q.eq("pi", ProductInfo::getDefinition, 1)
+                            .in("pi", ProductInfo::getCompanyId, SecurityUtils.getCompanyIds())
+                            .eq("pi", ProductInfo::getCompanyId, dto.getCompanyId())
+                    )
+                    .or().eq("pi", ProductInfo::getDefinition, 2)
+            );
         }
-        wrapper.and(q1 -> q1.
-                and(q -> q.eq("pi", ProductInfo::getDefinition, 1).eq("pi", ProductInfo::getCompanyId, dto.getCompanyId()))
-                .or().eq("pi", ProductInfo::getDefinition, 2)
-        );
 
         wrapper.orderByDesc("pi", ProductInfo::getId);
         return wrapper;
@@ -1025,12 +1024,9 @@ public class ProductInfoServiceImpl extends ServiceImpl<ProductInfoMapper, Produ
         IWrapper<Object> wrapper = IWrapper.getWrapper();
         wrapper.eq("pbd.material_id", dto.getMaterialId());
 
-        //权限过滤：产品-子公司看自己的产品，总公司看全部，物料没有限制
-        Long companyId = SecurityUtils.getCompanyId();
-        if (Objects.equals(companyId, 100L)) {
-            companyId = null;
-        }
-        wrapper.eq("pi.company_id", companyId);
+        //权限过滤：产品
+        wrapper.in("pi.company_id", SecurityUtils.getCompanyIds());
+        wrapper.eq("pi.company_id", dto.getCompanyId());
         return baseMapper.getProductByMaterialId(dto.getPage(), wrapper);
     }
 

hx-mes/src/main/java/com/fjhx/mes/service/material/impl/MaterialPreparationServiceImpl.java

@@ -18,7 +18,6 @@ import org.springframework.stereotype.Service;
 
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 import java.util.stream.Collectors;
 
 
@@ -48,13 +47,10 @@ public class MaterialPreparationServiceImpl extends ServiceImpl<MaterialPreparat
         //关键字过滤
         wrapper.keyword(dto.getKeyword(), new SqlField("pi.code"));
 
-        //权限过滤：生产备料-子公司看自己的,总公司看全部
-        Long companyId = SecurityUtils.getCompanyId();
-        if (!Objects.equals(companyId, 100L)) {
-            wrapper.eq("mp", MaterialPreparation::getCompanyId, companyId);
-        } else {
-            wrapper.eq("mp", MaterialPreparation::getCompanyId, dto.getCompanyId());
-        }
+        //权限过滤：生产备料
+        wrapper.in("mp", MaterialPreparation::getCompanyId, SecurityUtils.getCompanyIds());
+        wrapper.eq("mp", MaterialPreparation::getCompanyId, dto.getCompanyId());
+
 
         wrapper.orderByDesc("mp", MaterialPreparation::getCreateTime);
         wrapper.orderByDesc("mp", MaterialPreparation::getId);

hx-mes/src/main/java/com/fjhx/mes/service/production/impl/ProduceOrderDetailServiceImpl.java

@@ -94,13 +94,10 @@ public class ProduceOrderDetailServiceImpl extends ServiceImpl<ProduceOrderDetai
         wrapper.orderByDesc("po", ProductionOrder::getCreateTime);
         wrapper.orderByDesc("pod", ProductionOrderDetail::getId);
 
-        //权限过滤：生产任务-子公司看自己的,总公司看全部
-        Long companyId = SecurityUtils.getCompanyId();
-        if (!Objects.equals(companyId, 100L)) {
-            wrapper.eq("po", ProductionOrder::getCompanyId, companyId);
-        } else {
-            wrapper.eq("po", ProductionOrder::getCompanyId, dto.getCompanyId());
-        }
+        //权限过滤：生产任务
+        wrapper.in("po", ProductionOrder::getCompanyId, SecurityUtils.getCompanyIds());
+        wrapper.eq("po", ProductionOrder::getCompanyId, dto.getCompanyId());
+
 
         //是否逾期过滤
         if (ObjectUtil.isNotEmpty(dto.getIsOverdue())) {

hx-mes/src/main/java/com/fjhx/mes/service/production/impl/ProduceOrderServiceImpl.java

@@ -128,13 +128,10 @@ public class ProduceOrderServiceImpl extends ServiceImpl<ProduceOrderMapper, Pro
         //关键字
         wrapper.keyword(dto.getKeyword(), new SqlField("po", ProductionOrder::getCode));
 
-        //权限过滤：生产订单-子公司看自己的,总公司看全部
-        Long companyId = SecurityUtils.getCompanyId();
-        if (!Objects.equals(companyId, 100L)) {
-            wrapper.eq("po", ProductionOrder::getCompanyId, companyId);
-        } else {
-            wrapper.eq("po", ProductionOrder::getCompanyId, dto.getCompanyId());
-        }
+        //权限过滤：生产订单
+        wrapper.in("po", ProductionOrder::getCompanyId, SecurityUtils.getCompanyIds());
+        wrapper.eq("po", ProductionOrder::getCompanyId, dto.getCompanyId());
+
 
         //是否逾期过滤
         if (ObjectUtil.isNotEmpty(dto.getIsOverdue())) {
@@ -220,13 +217,11 @@ public class ProduceOrderServiceImpl extends ServiceImpl<ProduceOrderMapper, Pro
             wrapper.eq("IF(IFNULL(po.finish_time,NOW())>po.delivery_period,1,0)", dto.getIsOverdue());
         }
 
-        //权限过滤：生产排程-子公司看自己，总公司看全部
-        Long companyId = SecurityUtils.getCompanyId();
-        if (!Objects.equals(companyId, 100L)) {
-            wrapper.eq("po", ProductInfo::getCompanyId, companyId);
-        } else {
-            wrapper.eq("po", ProductInfo::getCompanyId, dto.getCompanyId());
-        }
+        //权限过滤：生产排程
+
+        wrapper.in("po", ProductInfo::getCompanyId, SecurityUtils.getCompanyIds());
+        wrapper.eq("po", ProductInfo::getCompanyId, dto.getCompanyId());
+
 
         wrapper.groupBy("po.id");
         wrapper.orderByAsc("po", ProductionOrder::getDeliveryPeriod);

hx-mes/src/main/java/com/fjhx/mes/service/production/impl/ProductionReportingDetailServiceImpl.java

@@ -22,7 +22,6 @@ import org.springframework.stereotype.Service;
 
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 import java.util.stream.Collectors;
 
 
@@ -49,13 +48,10 @@ public class ProductionReportingDetailServiceImpl extends ServiceImpl<Production
         IWrapper<ProductionReportingDetail> wrapper = getWrapper();
         wrapper.orderByDesc("prd", ProductionReportingDetail::getId);
 
-        //权限过滤：生产报工-子公司看自己的,总公司看全部
-        Long companyId = SecurityUtils.getCompanyId();
-        if (!Objects.equals(companyId, 100L)) {
-            wrapper.eq("prd", ProductionReportingDetail::getCompanyId, companyId);
-        } else {
-            wrapper.eq("prd", ProductionReportingDetail::getCompanyId, dto.getCompanyId());
-        }
+        //权限过滤：生产报工
+        wrapper.in("prd", ProductionReportingDetail::getCompanyId, SecurityUtils.getCompanyIds());
+        wrapper.eq("prd", ProductionReportingDetail::getCompanyId, dto.getCompanyId());
+
 
         //工序过滤
         wrapper.eq("prd", ProductionReportingDetail::getProductionProcessesId, dto.getProductionProcessesId());

hx-mes/src/main/java/com/fjhx/mes/service/production/impl/ProductionSchedulingServiceImpl.java

@@ -14,7 +14,6 @@ import org.springframework.stereotype.Service;
 
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -31,13 +30,10 @@ public class ProductionSchedulingServiceImpl extends ServiceImpl<ProductionSched
     @Override
     public Map<String, List<ProductionSchedulingVo>> listMap(ProductionSchedulingSelectDto dto) {
         IWrapper<ProductionScheduling> wrapper = getWrapper();
-        //权限过滤：生产排程统计 总公司看全部,子公司自己看自己
-        Long companyId = SecurityUtils.getCompanyId();
-        if (!Objects.equals(companyId, 100L)) {
-            wrapper.eq("ps", ProductionScheduling::getCompanyId, companyId);
-        } else {
-            wrapper.eq("ps", ProductionScheduling::getCompanyId, dto.getCompanyId());
-        }
+        //权限过滤：生产排程统计
+        wrapper.in("ps", ProductionScheduling::getCompanyId, SecurityUtils.getCompanyIds());
+        wrapper.eq("ps", ProductionScheduling::getCompanyId, dto.getCompanyId());
+
         //数据分组
         wrapper.groupBy("ps.scheduling_date", "ps.processes_id");
         //时间范围过滤

hx-mes/src/main/java/com/fjhx/mes/service/report/impl/ReportLossesDetailsServiceImpl.java

@@ -104,13 +104,9 @@ public class ReportLossesDetailsServiceImpl extends ServiceImpl<ReportLossesDeta
             );
         }
 
-        //权限过滤：报损统计-子公司看自己的,总公司看全部
-        Long companyId = SecurityUtils.getCompanyId();
-        if (!Objects.equals(companyId, 100L)) {
-            wrapper.eq("rld", ReportLossesDetails::getCompanyId, companyId);
-        } else {
-            wrapper.eq("rld", ReportLossesDetails::getCompanyId, dto.getCompanyId());
-        }
+        //权限过滤：报损统计
+        wrapper.in("rld", ReportLossesDetails::getCompanyId, SecurityUtils.getCompanyIds());
+        wrapper.eq("rld", ReportLossesDetails::getCompanyId, dto.getCompanyId());
 
 
         wrapper.groupBy("rld.id");
@@ -262,13 +258,10 @@ public class ReportLossesDetailsServiceImpl extends ServiceImpl<ReportLossesDeta
     public JSONObject lossesStatistics(ReportLossesDetailsSelectDto dto) {
         IWrapper<Object> wrapper = IWrapper.getWrapper();
 
-        //权限过滤：报损统计-子公司看自己的,总公司看全部
-        Long companyId = SecurityUtils.getCompanyId();
-        if (!Objects.equals(companyId, 100L)) {
-            wrapper.eq("rld", ReportLossesDetails::getCompanyId, companyId);
-        } else {
-            wrapper.eq("rld", ReportLossesDetails::getCompanyId, dto.getCompanyId());
-        }
+        //权限过滤：报损统计
+        wrapper.in("rld", ReportLossesDetails::getCompanyId, SecurityUtils.getCompanyIds());
+        wrapper.eq("rld", ReportLossesDetails::getCompanyId, dto.getCompanyId());
+
 
         //近n天过滤
         Integer pastDay = dto.getPastDay();

hx-mes/src/main/java/com/fjhx/mes/service/work/impl/WorkOrderServiceImpl.java

@@ -42,7 +42,6 @@ import java.math.RoundingMode;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 import java.util.stream.Collectors;
 
 
@@ -88,13 +87,10 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
         wrapper.eq("wo", WorkOrder::getSource, dto.getSource());
         wrapper.orderByDesc("wo", WorkOrder::getId);
 
-        //权限过滤：生产工单-子公司看自己的,总公司看全部
-        Long companyId = SecurityUtils.getCompanyId();
-        if (!Objects.equals(companyId, 100L)) {
-            wrapper.eq("wo", WorkOrder::getCompanyId, companyId);
-        } else {
-            wrapper.eq("wo", WorkOrder::getCompanyId, dto.getCompanyId());
-        }
+        //权限过滤：生产工单
+        wrapper.in("wo", WorkOrder::getCompanyId, SecurityUtils.getCompanyIds());
+        wrapper.eq("wo", WorkOrder::getCompanyId, dto.getCompanyId());
+
 
         Page<WorkOrderVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
         List<WorkOrderVo> records = page.getRecords();

hx-purchase/src/main/java/com/fjhx/purchase/service/invoice/impl/InvoiceServiceImpl.java

@@ -31,7 +31,6 @@ import org.springframework.stereotype.Service;
 import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 import java.util.stream.Collectors;
 
 
@@ -71,13 +70,10 @@ public class InvoiceServiceImpl extends ServiceImpl<InvoiceMapper, Invoice> impl
         if (StringUtils.isNotEmpty(dto.getKeyword())) {
             wrapper.keyword(dto.getKeyword(), new SqlField("t1.purchaseCodes"));
         }
-        //权限过滤：发票-子公司看自己/关联公司的,总公司看全部
-        Long companyId = SecurityUtils.getCompanyId();
-        if (!Objects.equals(companyId, 100L)) {
+        //权限过滤：发票
             wrapper.in("t1", Invoice::getCompanyId, SecurityUtils.getCompanyIds());
-        } else {
             wrapper.eq("t1", Invoice::getCompanyId, dto.getCompanyId());
-        }
+
 
         wrapper.orderByDesc("t1", Invoice::getCreateTime);
         Page<InvoiceVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);

hx-purchase/src/main/java/com/fjhx/purchase/service/pay/impl/PayServiceImpl.java

@@ -110,13 +110,10 @@ public class PayServiceImpl extends ServiceImpl<PayMapper, Pay> implements PaySe
             wrapper.keyword(dto.getKeyword(), new SqlField(Pay::getUserName), new SqlField(Pay::getRemark));
         }
 
-        //权限过滤：采购付款-子公司看自己/关联公司的,总公司看全部
-        Long companyId = SecurityUtils.getCompanyId();
-        if (!Objects.equals(companyId, 100L)) {
+        //权限过滤：采购付款
             wrapper.in("p", Pay::getCompanyId, SecurityUtils.getCompanyIds());
-        } else {
             wrapper.eq("p", Pay::getCompanyId, dto.getCompanyId());
-        }
+
 
         wrapper.orderByDesc("p", Pay::getCreateTime);
         Page<PayVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);

hx-purchase/src/main/java/com/fjhx/purchase/service/subscribe/impl/SubscribeDetailServiceImpl.java

@@ -106,13 +106,9 @@ public class SubscribeDetailServiceImpl extends ServiceImpl<SubscribeDetailMappe
 
         wrapper.eq("t2", SubscribeDetail::getDataType, dto.getDataType());
 
-        //权限过滤：待采购-子公司看自己以及关联公司的,总公司看全部
-        Long companyId = SecurityUtils.getCompanyId();
-        if (!Objects.equals(companyId, 100L)) {
+        //权限过滤：待采购
             wrapper.in("t2", SubscribeDetail::getCompanyId, SecurityUtils.getCompanyIds());
-        } else {
             wrapper.eq("t2", SubscribeDetail::getCompanyId, dto.getCompanyId());
-        }
 
 
         wrapper.orderByDesc("t2", SubscribeDetail::getCreateTime);

hx-purchase/src/main/java/com/fjhx/purchase/service/subscribe/impl/SubscribeServiceImpl.java

@@ -43,7 +43,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 
@@ -82,13 +85,10 @@ public class SubscribeServiceImpl extends ServiceImpl<SubscribeMapper, Subscribe
     public Page<SubscribeVo> getPage(SubscribeSelectDto dto) {
         IWrapper<Subscribe> wrapper = getWrapper();
 
-        //权限过滤：申购-子公司看自己的,总公司看全部
-        Long companyId = SecurityUtils.getCompanyId();
-        if (!Objects.equals(companyId, 100L)) {
-            wrapper.eq("s", Subscribe::getCompanyId, companyId);
-        } else {
-            wrapper.eq("s", Subscribe::getCompanyId, dto.getCompanyId());
-        }
+        //权限过滤：申购
+        wrapper.in("s", Subscribe::getCompanyId, SecurityUtils.getCompanyIds());
+        wrapper.eq("s", Subscribe::getCompanyId, dto.getCompanyId());
+
 
         wrapper.orderByDesc("s", Subscribe::getId);
         Page<SubscribeVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);

hx-sale/src/main/java/com/fjhx/sale/service/after/impl/AfterSalesServiceImpl.java

@@ -24,7 +24,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
-import java.util.Objects;
 
 
 /**
@@ -53,13 +52,10 @@ public class AfterSalesServiceImpl extends ServiceImpl<AfterSalesMapper, AfterSa
     public Page<AfterSalesVo> getPage(AfterSalesSelectDto dto) {
         IWrapper<AfterSales> wrapper = getWrapper();
 
-        //权限过滤：售后管理-子公司看自己的,总公司看全部
-        Long companyId = SecurityUtils.getCompanyId();
-        if (!Objects.equals(companyId, 100L)) {
-            wrapper.eq("as1", AfterSales::getCompanyId, companyId);
-        } else {
-            wrapper.eq("as1", AfterSales::getCompanyId, dto.getCompanyId());
-        }
+        //权限过滤：售后管理
+        wrapper.in("as1", AfterSales::getCompanyId, SecurityUtils.getCompanyIds());
+        wrapper.eq("as1", AfterSales::getCompanyId, dto.getCompanyId());
+
 
         wrapper.keyword(dto.getKeyword(), new SqlField("as1.code"), new SqlField("c.code"));
 

hx-sale/src/main/java/com/fjhx/sale/service/contract/impl/ContractServiceImpl.java

@@ -324,13 +324,10 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
      * @param wrapper
      */
     private void setContractParam(ContractSelectDto dto, IWrapper<Contract> wrapper) {
-        //权限过滤：销售合同-子公司看自己的,总公司看全部
-        Long ofCompanyId = SecurityUtils.getCompanyId();
-        if (!Objects.equals(ofCompanyId, 100L)) {
-            wrapper.eq("t1", Contract::getOfCompanyId, ofCompanyId);
-        } else {
-            wrapper.eq("t1", Contract::getOfCompanyId, dto.getOfCompanyId());
-        }
+        //权限过滤：销售合同
+        wrapper.in("t1", Contract::getOfCompanyId, SecurityUtils.getCompanyIds());
+        wrapper.eq("t1", Contract::getOfCompanyId, dto.getOfCompanyId());
+
 
         //生产公司过滤
         wrapper.eq("t1", Contract::getCompanyId, dto.getCompanyId());

hx-sale/src/main/java/com/fjhx/sale/service/ext/impl/ExtQuotationServiceImpl.java

@@ -83,7 +83,9 @@ public class ExtQuotationServiceImpl extends ServiceImpl<ExtQuotationMapper, Ext
     public Page<ExtQuotationVo> getPage(ExtQuotationSelectDto dto) {
         IWrapper<ExtQuotation> wrapper = getWrapper();
 
-        //权限过滤：
+        //权限过滤：对外报价单
+        wrapper.in("eq", ExtQuotation::getOfCompanyId, SecurityUtils.getCompanyIds());
+        wrapper.eq("eq", ExtQuotation::getOfCompanyId, dto.getOfCompanyId());
 
         //报价状态
         wrapper.eq(SaleQuotation::getQuotationStatus, dto.getQuotationStatus());

hx-sale/src/main/java/com/fjhx/sale/service/purchase/impl/EhsdPurchaseServiceImpl.java

@@ -181,13 +181,10 @@ public class EhsdPurchaseServiceImpl extends ServiceImpl<EhsdPurchaseMapper, Ehs
             wrapper.ne(EhsdPurchase::getStatus, FlowStatusEnum1.UPDATE.getKey());
         }
 
-        //权限过滤：采购-子公司看自己/关联公司的,总公司看全部
-        Long companyId = SecurityUtils.getCompanyId();
-        if (!Objects.equals(companyId, 100L)) {
+        //权限过滤：采购
             wrapper.in("t1", EhsdPurchase::getCompanyId, SecurityUtils.getCompanyIds());
-        } else {
             wrapper.eq("t1", EhsdPurchase::getCompanyId, dto.getCompanyId());
-        }
+
 
         wrapper.orderByDesc("t1", EhsdPurchase::getCreateTime);
 

hx-sale/src/main/java/com/fjhx/sale/service/purchase/impl/PurchaseBackServiceImpl.java

@@ -32,7 +32,6 @@ import org.springframework.stereotype.Service;
 import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 import java.util.stream.Collectors;
 
 
@@ -69,13 +68,10 @@ public class PurchaseBackServiceImpl extends ServiceImpl<PurchaseBackMapper, Pur
     public Page<PurchaseBackVo> getPage(PurchaseBackSelectDto dto) {
         IWrapper<PurchaseBack> wrapper = getWrapper();
 
-        //权限过滤：售后管理-子公司看自己/关联公司的,总公司看全部
-        Long companyId = SecurityUtils.getCompanyId();
-        if (!Objects.equals(companyId, 100L)) {
+        //权限过滤：售后管理
             wrapper.in("pb", PurchaseBack::getCompanyId, SecurityUtils.getCompanyIds());
-        } else {
             wrapper.eq("pb", PurchaseBack::getCompanyId, dto.getCompanyId());
-        }
+
 
         wrapper.keyword(dto.getKeyword(), new SqlField("pb.code"), new SqlField("p.code"));
 

hx-sale/src/main/java/com/fjhx/sale/service/sale/impl/SaleQuotationServiceImpl.java

@@ -115,15 +115,14 @@ public class SaleQuotationServiceImpl extends ServiceImpl<SaleQuotationMapper, S
 
         IWrapper<SaleQuotation> wrapper = IWrapper.getWrapper();
 
-        //权限过滤：报价评估自己看自己
-        Long companyId = SecurityUtils.getCompanyId();
+        //权限过滤
         if (Objects.equals(dto.getIsEstimate(), 1)) {
             //根据报价公司过滤
-            wrapper.eq("sq", SaleQuotation::getCompanyId, companyId);
+            wrapper.in("sq", SaleQuotation::getCompanyId, SecurityUtils.getCompanyIds());
             wrapper.ne("sq", SaleQuotation::getStatus, FlowStatusEnum1.DRAFT.getKey());
         } else {
             //报价单根据 归属公司过滤
-            wrapper.eq(SaleQuotation::getOfCompanyId, companyId);
+            wrapper.in(SaleQuotation::getOfCompanyId, SecurityUtils.getCompanyIds());
         }
 
         //归属公司 报价公司过滤

hx-supply/src/main/java/com/fjhx/supply/entity/supplier/dto/SupplierPriceSelectDto.java

@@ -24,4 +24,9 @@ public class SupplierPriceSelectDto extends BaseSelectDto {
      */
     private Integer definition;
 
+    /**
+     * 生产公司id
+     */
+    private Long companyId;
+
 }

hx-supply/src/main/java/com/fjhx/supply/service/supplier/impl/SupplierInfoServiceImpl.java

@@ -30,7 +30,10 @@ import com.ruoyi.common.utils.wrapper.SqlField;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 
@@ -63,13 +66,10 @@ public class SupplierInfoServiceImpl extends ServiceImpl<SupplierInfoMapper, Sup
                 new SqlField("si", SupplierInfo::getCode)
         );
 
-        //权限过滤：供应商自己看自己，总公司看全部
-        Long companyId = SecurityUtils.getCompanyId();
-        if (!Objects.equals(companyId, 100L)) {
-            wrapper.eq("si", SupplierInfo::getCompanyId, companyId);
-        } else {
-            wrapper.eq("si", SupplierInfo::getCompanyId, dto.getCompanyId());
-        }
+        //权限过滤：供应商
+        wrapper.in("si", SupplierInfo::getCompanyId, SecurityUtils.getCompanyIds());
+        wrapper.eq("si", SupplierInfo::getCompanyId, dto.getCompanyId());
+
 
         wrapper.orderByDesc("si", SupplierInfo::getId);
 

hx-supply/src/main/java/com/fjhx/supply/service/supplier/impl/SupplierPriceServiceImpl.java

@@ -70,8 +70,9 @@ public class SupplierPriceServiceImpl extends ServiceImpl<SupplierPriceMapper, S
         wrapper.eq("si", SupplierInfo::getType, dto.getSupplierType());
         wrapper.keyword(dto, new SqlField("si.name"));
 
-        //权限过滤：供应商价格自己看自己
-        wrapper.eq("sp", SupplierPrice::getCompanyId, SecurityUtils.getCompanyId());
+        //权限过滤：供应商价格
+        wrapper.in("sp", SupplierPrice::getCompanyId, SecurityUtils.getCompanyIds());
+        wrapper.eq("sp", SupplierPrice::getCompanyId, dto.getCompanyId());
 
         Page<SupplierPriceVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
         List<SupplierPriceVo> records = page.getRecords();

hx-wms/src/main/java/com/fjhx/wms/service/stock/impl/StockJournalDetailsServiceImpl.java

@@ -24,7 +24,6 @@ import org.springframework.stereotype.Service;
 
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 import java.util.stream.Collectors;
 
 
@@ -67,13 +66,10 @@ public class StockJournalDetailsServiceImpl extends ServiceImpl<StockJournalDeta
             );
         }
 
-        //权限过滤：出入库流水-子公司看自己/关联公司，总公司看全部
-        Long companyId = SecurityUtils.getCompanyId();
-        if (!Objects.equals(companyId, 100L)) {
+        //权限过滤：出入库流水
             wrapper.in("sjd.company_id", SecurityUtils.getCompanyIds());
-        } else {
             wrapper.eq("sjd.company_id", dto.getCompanyId());
-        }
+
 
         //是否归还过滤
         Integer isRestitution = dto.getIsRestitution();

hx-wms/src/main/java/com/fjhx/wms/service/stock/impl/StockJournalServiceImpl.java

@@ -31,7 +31,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
-import java.util.Objects;
 
 
 /**
@@ -98,13 +97,10 @@ public class StockJournalServiceImpl extends ServiceImpl<StockJournalMapper, Sto
             }
         }
 
-        //权限过滤：出入库流水-子公司看自己，总公司看全部
-        Long companyId = SecurityUtils.getCompanyId();
-        if (!Objects.equals(companyId, 100L)) {
-            wrapper.eq("sj.company_id", companyId);
-        } else {
-            wrapper.eq("sj.company_id", dto.getCompanyId());
-        }
+        //权限过滤：出入库流水
+        wrapper.in("sj.company_id", SecurityUtils.getCompanyIds());
+        wrapper.eq("sj.company_id", dto.getCompanyId());
+
 
         wrapper.orderByDesc("sj", StockJournal::getCreateTime);
         Page<StockJournalVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);

hx-wms/src/main/java/com/fjhx/wms/service/stock/impl/StockServiceImpl.java

@@ -43,7 +43,10 @@ import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -87,13 +90,10 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
 
         wrapper.eq("pi.product_classify_id", dto.getProductClassifyId());
 
-        //权限过滤：库存-子公司看自己的,总公司看全部
-        Long companyId = SecurityUtils.getCompanyId();
-        if (!Objects.equals(companyId, 100L)) {
-            wrapper.eq("s.company_id", companyId);
-        } else {
-            wrapper.eq("s.company_id", dto.getCompanyId());
-        }
+        //权限过滤：库存
+        wrapper.in("s.company_id", SecurityUtils.getCompanyIds());
+        wrapper.eq("s.company_id", dto.getCompanyId());
+
 
         wrapper.orderByDesc("s", Stock::getId);
         Page<StockVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);

hx-wms/src/main/java/com/fjhx/wms/service/stock/impl/StockSnapshotDetailsServiceImpl.java

@@ -22,7 +22,6 @@ import org.springframework.stereotype.Service;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -63,13 +62,10 @@ public class StockSnapshotDetailsServiceImpl extends ServiceImpl<StockSnapshotDe
 
         wrapper.eq("pi.product_classify_id", dto.getProductClassifyId());
 
-        //权限过滤：库存快照-子公司看自己的,总公司看全部
-        Long companyId = SecurityUtils.getCompanyId();
-        if (!Objects.equals(companyId, 100L)) {
-            wrapper.eq("ssd.company_id", companyId);
-        } else {
-            wrapper.eq("ssd.company_id", dto.getCompanyId());
-        }
+        //权限过滤：库存快照
+        wrapper.in("ssd.company_id", SecurityUtils.getCompanyIds());
+        wrapper.eq("ssd.company_id", dto.getCompanyId());
+
 
         wrapper.orderByDesc("ssd", StockSnapshotDetails::getId);
         Page<StockSnapshotDetailsVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);

hx-wms/src/main/java/com/fjhx/wms/service/stock/impl/StockWaitServiceImpl.java

@@ -30,7 +30,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 
@@ -63,13 +66,10 @@ public class StockWaitServiceImpl extends ServiceImpl<StockWaitMapper, StockWait
     public Page<StockWaitVo> getPage(StockWaitSelectDto dto) {
         IWrapper<StockWait> wrapper = getWrapper();
 
-        //权限过滤：待出入库-子公司看自己/关联公司的,总公司看全部
-        Long companyId = SecurityUtils.getCompanyId();
-        if (!Objects.equals(companyId, 100L)) {
+        //权限过滤：待出入库
             wrapper.in("sw", StockWait::getCompanyId, SecurityUtils.getCompanyIds());
-        } else {
             wrapper.eq("sw", StockWait::getCompanyId, dto.getCompanyId());
-        }
+
 
         //状态过滤
         Integer status = dto.getStatus();

hx-wms/src/main/java/com/fjhx/wms/service/warehouse/impl/WarehouseServiceImpl.java

@@ -19,7 +19,10 @@ import com.ruoyi.system.utils.UserUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.*;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 
@@ -43,13 +46,10 @@ public class WarehouseServiceImpl extends ServiceImpl<WarehouseMapper, Warehouse
         wrapper.like("w", Warehouse::getName, dto.getKeyword());
         wrapper.eq("w", Warehouse::getType, dto.getType());
 
-        //权限过滤：仓库-子公司看自己的,总公司看全部
-        Long companyId = SecurityUtils.getCompanyId();
-        if (!Objects.equals(companyId, 100L)) {
-            wrapper.eq("w", Warehouse::getCompanyId, companyId);
-        } else {
-            wrapper.eq("w", Warehouse::getCompanyId, dto.getCompanyId());
-        }
+        //权限过滤：仓库
+        wrapper.in("w", Warehouse::getCompanyId, SecurityUtils.getCompanyIds());
+        wrapper.eq("w", Warehouse::getCompanyId, dto.getCompanyId());
+
 
         wrapper.orderByDesc("w", Warehouse::getId);
         Page<WarehouseVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);