采购，出入库模块权限修改

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

@@ -29,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;
 
 
@@ -65,8 +66,13 @@ public class InvoiceServiceImpl extends ServiceImpl<InvoiceMapper, Invoice> impl
         if (StringUtils.isNotEmpty(dto.getKeyword())) {
             wrapper.keyword(dto.getKeyword(), new SqlField("t1.purchaseCodes"));
         }
-        //权限过滤：发票-子公司看自己的
-        wrapper.eq("t1", Invoice::getCompanyId, SecurityUtils.getCompanyId());
+        //权限过滤：发票-子公司看自己/关联公司的,总公司看全部
+        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

@@ -106,8 +106,13 @@ public class PayServiceImpl extends ServiceImpl<PayMapper, Pay> implements PaySe
             wrapper.keyword(dto.getKeyword(), new SqlField(Pay::getUserName), new SqlField(Pay::getRemark));
         }
 
-        //权限过滤：采购付款-子公司看自己的
-        wrapper.eq("p", Pay::getCompanyId, SecurityUtils.getCompanyId());
+        //权限过滤：采购付款-子公司看自己/关联公司的,总公司看全部
+        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

@@ -27,7 +27,6 @@ import com.fjhx.tenant.entity.dict.dto.DictTenantDataSelectDto;
 import com.fjhx.tenant.entity.dict.vo.DictTenantDataVo;
 import com.fjhx.tenant.service.dict.DictTenantDataService;
 import com.fjhx.tenant.utils.DeptUstil;
-import com.fjhx.wms.service.warehouse.WarehouseService;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.wrapper.IWrapper;
@@ -57,9 +56,6 @@ public class SubscribeDetailServiceImpl extends ServiceImpl<SubscribeDetailMappe
     private ProductInfoService productInfoService;
 
     @Autowired
-    private WarehouseService warehouseService;
-
-    @Autowired
     private PurchaseDetailService purchaseDetailService;
 
     @Autowired
@@ -106,10 +102,10 @@ public class SubscribeDetailServiceImpl extends ServiceImpl<SubscribeDetailMappe
 
         wrapper.eq("t2", SubscribeDetail::getDataType, dto.getDataType());
 
-        //权限过滤：待采购-子公司看自己的,总公司看全部
+        //权限过滤：待采购-子公司看自己以及关联公司的,总公司看全部
         Long companyId = SecurityUtils.getCompanyId();
         if (!Objects.equals(companyId, 100L)) {
-            wrapper.eq("t2", SubscribeDetail::getCompanyId, companyId);
+            wrapper.in("t2", SubscribeDetail::getCompanyId, SecurityUtils.getCompanyIds());
         } else {
             wrapper.eq("t2", SubscribeDetail::getCompanyId, dto.getCompanyId());
         }

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

@@ -172,10 +172,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.eq("t1", EhsdPurchase::getCompanyId, companyId);
+            wrapper.in("t1", EhsdPurchase::getCompanyId, SecurityUtils.getCompanyIds());
         } else {
             wrapper.eq("t1", EhsdPurchase::getCompanyId, dto.getCompanyId());
         }

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

@@ -65,10 +65,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.eq("pb", PurchaseBack::getCompanyId, companyId);
+            wrapper.in("pb", PurchaseBack::getCompanyId, SecurityUtils.getCompanyIds());
         } else {
             wrapper.eq("pb", PurchaseBack::getCompanyId, dto.getCompanyId());
         }

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

@@ -61,10 +61,10 @@ public class StockJournalDetailsServiceImpl extends ServiceImpl<StockJournalDeta
             );
         }
 
-        //权限过滤：出入库流水-子公司看自己，总公司看全部
+        //权限过滤：出入库流水-子公司看自己/关联公司，总公司看全部
         Long companyId = SecurityUtils.getCompanyId();
         if (!Objects.equals(companyId, 100L)) {
-            wrapper.eq("sjd.company_id", companyId);
+            wrapper.in("sjd.company_id", SecurityUtils.getCompanyIds());
         } else {
             wrapper.eq("sjd.company_id", dto.getCompanyId());
         }

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

@@ -57,10 +57,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.eq("sw", StockWait::getCompanyId, companyId);
+            wrapper.in("sw", StockWait::getCompanyId, SecurityUtils.getCompanyIds());
         } else {
             wrapper.eq("sw", StockWait::getCompanyId, dto.getCompanyId());
         }