单证权限调整

hx-sale/src/main/java/com/fjhx/sale/entity/documents/dto/DocumentsSelectDto.java

@@ -19,4 +19,6 @@ public class DocumentsSelectDto extends BaseSelectDto {
      */
     private Long contractId;
 
+    private Long companyId;
+
 }

hx-sale/src/main/java/com/fjhx/sale/entity/documents/po/Documents.java

@@ -49,4 +49,9 @@ public class Documents extends BasePo {
      * 包装出货主合同表ID
      */
     private Long packShipmentId;
+
+    /**
+     * 归属公司id
+     */
+    private Long companyId;
 }

hx-sale/src/main/java/com/fjhx/sale/entity/pack/po/PackShipment.java

@@ -1,7 +1,7 @@
 package com.fjhx.sale.entity.pack.po;
 
-import com.ruoyi.common.core.domain.BasePo;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BasePo;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -33,6 +33,6 @@ public class PackShipment extends BasePo {
      */
     private String remark;
 
-
+    private Long companyId;
 
 }

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

@@ -4,12 +4,10 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson2.JSONObject;
 import com.alibaba.fastjson2.JSONWriter;
-import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
 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.area.utils.CustomizeAreaUtil;
-import com.fjhx.common.constant.SourceConstant;
 import com.fjhx.common.entity.corporation.po.Corporation;
 import com.fjhx.common.service.corporation.CorporationService;
 import com.fjhx.customer.entity.customer.po.Customer;
@@ -39,12 +37,11 @@ import com.fjhx.sale.service.documents.DocumentsTransportService;
 import com.fjhx.sale.service.pack.PackDetailGoodsService;
 import com.fjhx.sale.service.pack.PackDetailService;
 import com.fjhx.sale.service.pack.PackShipmentService;
-import com.ruoyi.common.core.domain.entity.SysUser;
 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.system.service.ISysUserService;
-import com.ruoyi.system.utils.UserUtil;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -113,18 +110,23 @@ public class DocumentsServiceImpl extends ServiceImpl<DocumentsMapper, Documents
     @Override
     public Page<DocumentsVo> getPage(DocumentsSelectDto dto) {
         IWrapper<Documents> wrapper = getWrapper();
-        SysUser sysUser = UserUtil.getUserInfo();
-        if(StringUtils.isEmpty(sysUser.getUserCode())){//不是业务员看所有
-            return pageCommon(dto, wrapper);
-        }else{//是业务员
-            List<Long> authIdList = customerService.getAuthIdList();
-            if (authIdList.size() == 0) {
-                return new Page<>();
-            }
-            wrapper.in("c", Contract::getBuyCorporationId, authIdList);
-            return pageCommon(dto, wrapper);
-        }
-
+//        SysUser sysUser = UserUtil.getUserInfo();
+//        if(StringUtils.isEmpty(sysUser.getUserCode())){//不是业务员看所有
+//            return pageCommon(dto, wrapper);
+//        }else{//是业务员
+//            List<Long> authIdList = customerService.getAuthIdList();
+//            if (authIdList.size() == 0) {
+//                return new Page<>();
+//            }
+//            wrapper.in("c", Contract::getBuyCorporationId, authIdList);
+//            return pageCommon(dto, wrapper);
+//        }
+
+        //权限过滤：单证选合同
+        wrapper.in("d.company_id", SecurityUtils.getCompanyIds());
+        wrapper.eq("d.company_id", dto.getCompanyId());
+
+        return pageCommon(dto, wrapper);
     }
 
     public Page<DocumentsVo> pageCommon(DocumentsSelectDto dto,IWrapper<Documents> wrapper){
@@ -184,6 +186,7 @@ public class DocumentsServiceImpl extends ServiceImpl<DocumentsMapper, Documents
      */
     @Override
     public void add(DocumentsDto documentsDto) {
+        documentsDto.setCompanyId(SecurityUtils.getCompanyId());
         //添加单证表的数据
         this.save(documentsDto);
 

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

@@ -142,6 +142,7 @@ public class PackDetailServiceImpl extends ServiceImpl<PackDetailMapper, PackDet
         PackShipment packShipment = new PackShipment();
         packShipment.setPackDetailIds(StringUtils.join(ids, ","));
         packShipment.setContractId(contractId);
+        packShipment.setCompanyId(SecurityUtils.getCompanyId());
         packShipmentService.save(packShipment);
     }
 

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

@@ -9,16 +9,15 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.sale.entity.documents.po.Documents;
 import com.fjhx.sale.entity.pack.dto.PackShipmentDto;
 import com.fjhx.sale.entity.pack.dto.PackShipmentSelectDto;
-import com.fjhx.sale.entity.pack.po.Pack;
 import com.fjhx.sale.entity.pack.po.PackDetailGoods;
 import com.fjhx.sale.entity.pack.po.PackShipment;
 import com.fjhx.sale.entity.pack.vo.PackShipmentVo;
 import com.fjhx.sale.mapper.pack.PackShipmentMapper;
 import com.fjhx.sale.service.documents.DocumentsService;
 import com.fjhx.sale.service.pack.PackDetailGoodsService;
-import com.fjhx.sale.service.pack.PackDetailProductService;
 import com.fjhx.sale.service.pack.PackShipmentService;
 import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -40,9 +39,6 @@ public class PackShipmentServiceImpl extends ServiceImpl<PackShipmentMapper, Pac
     private PackDetailGoodsService packDetailGoodsService;
 
     @Autowired
-    private PackDetailProductService packDetailProductService;
-
-    @Autowired
     private DocumentsService documentsService;
 
     @Override
@@ -88,6 +84,8 @@ public class PackShipmentServiceImpl extends ServiceImpl<PackShipmentMapper, Pac
         List<PackShipmentVo> packShipments = baseMapper.getList(Wrappers.query()
                 .like(ObjectUtil.isNotEmpty(dto.getKeyword()), "c.code", dto.getKeyword())
                 .notIn(ObjectUtil.isNotEmpty(packShipmentIds), "ps.id", packShipmentIds)
+                //权限过滤：单证选合同
+                .in("ps.company_id", SecurityUtils.getCompanyIds())
         );
         return packShipments;
     }