发票管理，采购付款 添加权限

hx-purchase/src/main/java/com/fjhx/purchase/entity/invoice/po/Invoice.java

@@ -4,13 +4,12 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fjhx.file.entity.ObsFile;
 import com.ruoyi.common.core.domain.BasePo;
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-
 import lombok.Getter;
 import lombok.Setter;
 
+import java.math.BigDecimal;
+import java.util.List;
+
 /**
  * <p>
  * 发票管理
@@ -56,4 +55,9 @@ public class Invoice extends BasePo {
     @TableField(exist = false)
     private List<ObsFile> fileList;
 
+    /**
+     * 归属公司id
+     */
+    private Long companyId;
+
 }

hx-purchase/src/main/java/com/fjhx/purchase/entity/pay/po/Pay.java

@@ -157,4 +157,9 @@ public class Pay extends BasePo {
     @TableField(exist = false)
     private BigDecimal money;
 
+    /**
+     * 归属公司id
+     */
+    private Long companyId;
+
 }

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

@@ -1,14 +1,12 @@
 package com.fjhx.purchase.service.invoice.impl;
 
 import cn.hutool.core.bean.BeanUtil;
-import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fjhx.common.constant.SourceConstant;
 import com.fjhx.file.utils.ObsFileUtil;
 import com.fjhx.purchase.entity.invoice.dto.InvoiceSelectDto;
 import com.fjhx.purchase.entity.invoice.po.Invoice;
@@ -20,6 +18,7 @@ import com.fjhx.purchase.service.invoice.InvoiceDetailsService;
 import com.fjhx.purchase.service.invoice.InvoiceService;
 import com.fjhx.supply.entity.supplier.po.SupplierInfo;
 import com.fjhx.supply.service.supplier.SupplierInfoService;
+import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import com.ruoyi.common.utils.wrapper.SqlField;
@@ -30,6 +29,7 @@ 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;
 
 
@@ -59,23 +59,28 @@ public class InvoiceServiceImpl extends ServiceImpl<InvoiceMapper, Invoice> impl
     @Override
     public Page<InvoiceVo> getPage(InvoiceSelectDto dto) {
         IWrapper<Invoice> wrapper = getWrapper();
-        wrapper.orderByDesc("t1", Invoice::getCreateTime);
-        if(ObjectUtils.isNotEmpty(dto.getInvoiceType())){
-            wrapper.eq("t1", Invoice::getType,dto.getInvoiceType());
+        if (ObjectUtils.isNotEmpty(dto.getInvoiceType())) {
+            wrapper.eq("t1", Invoice::getType, dto.getInvoiceType());
         }
-        if(StringUtils.isNotEmpty(dto.getKeyword())){
+        if (StringUtils.isNotEmpty(dto.getKeyword())) {
             wrapper.keyword(dto.getKeyword(), new SqlField("t1.purchaseCodes"));
         }
+        //权限过滤：发票-子公司看自己的,总公司看全部
+        Long companyId = SecurityUtils.getCompanyId();
+        if (!Objects.equals(companyId, 100L)) {
+            wrapper.eq(Invoice::getCompanyId, companyId);
+        }
+        wrapper.orderByDesc("t1", Invoice::getCreateTime);
         Page<InvoiceVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
         List<InvoiceVo> list = page.getRecords();
-        if(CollectionUtils.isNotEmpty(list)){
+        if (CollectionUtils.isNotEmpty(list)) {
             List<Long> supplyIds = list.stream().map(InvoiceVo::getSupplyId).collect(Collectors.toList());
-            List<SupplierInfo> supplierInfoList = supplierInfoService.list(Wrappers.<SupplierInfo>query().lambda().in(SupplierInfo::getId,supplyIds));
-            Map<Long,List<SupplierInfo>> supplyMap = supplierInfoList.stream().distinct().collect(Collectors.groupingBy(SupplierInfo::getId));
-            if(MapUtils.isNotEmpty(supplyMap)){
-                for(InvoiceVo p:list){
-                    List<SupplierInfo> supplys = supplyMap.getOrDefault(p.getSupplyId(),null);
-                    p.setSupplyName(supplys==null?null:supplys.get(0).getName());
+            List<SupplierInfo> supplierInfoList = supplierInfoService.list(Wrappers.<SupplierInfo>query().lambda().in(SupplierInfo::getId, supplyIds));
+            Map<Long, List<SupplierInfo>> supplyMap = supplierInfoList.stream().distinct().collect(Collectors.groupingBy(SupplierInfo::getId));
+            if (MapUtils.isNotEmpty(supplyMap)) {
+                for (InvoiceVo p : list) {
+                    List<SupplierInfo> supplys = supplyMap.getOrDefault(p.getSupplyId(), null);
+                    p.setSupplyName(supplys == null ? null : supplys.get(0).getName());
                 }
             }
         }

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

@@ -28,6 +28,7 @@ import com.fjhx.supply.entity.supplier.po.SupplierInfo;
 import com.fjhx.supply.service.supplier.SupplierInfoService;
 import com.ruoyi.common.core.domain.BaseIdPo;
 import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import com.ruoyi.common.utils.wrapper.SqlField;
@@ -79,7 +80,6 @@ public class PayServiceImpl extends ServiceImpl<PayMapper, Pay> implements PaySe
     @Override
     public Page<PayVo> getPage(PaySelectDto dto) {
         IWrapper<Pay> wrapper = getWrapper();
-        wrapper.orderByDesc("p", Pay::getCreateTime);
 
         // 供应商ID
         wrapper.eq("p", Pay::getSupplyId, dto.getSupplyId());
@@ -105,6 +105,14 @@ public class PayServiceImpl extends ServiceImpl<PayMapper, Pay> implements PaySe
         if (StringUtils.isNotEmpty(dto.getKeyword())) {
             wrapper.keyword(dto.getKeyword(), new SqlField(Pay::getUserName), new SqlField(Pay::getRemark));
         }
+
+        //权限过滤：发票-子公司看自己的,总公司看全部
+        Long companyId = SecurityUtils.getCompanyId();
+        if (!Objects.equals(companyId, 100L)) {
+            wrapper.eq(Pay::getCompanyId, companyId);
+        }
+
+        wrapper.orderByDesc("p", Pay::getCreateTime);
         Page<PayVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
         List<PayVo> list = page.getRecords();