diff --git a/SC-boot/linkage-common/src/main/java/jnpf/base/Pagination.java b/SC-boot/linkage-common/src/main/java/jnpf/base/Pagination.java
index b26cfd7d..7fae107f 100644
--- a/SC-boot/linkage-common/src/main/java/jnpf/base/Pagination.java
+++ b/SC-boot/linkage-common/src/main/java/jnpf/base/Pagination.java
@@ -23,8 +23,8 @@ public class Pagination extends Page{
     private String sidx="";
     @ApiModelProperty(value = "当前页数",example = "1")
     private long currentPage=1;
-
-
+    @ApiModelProperty(value = "菜单id")
+    private String menuId;
 
     @ApiModelProperty(hidden = true)
     @JsonIgnore
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/mapper/ArinvoicesMapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/mapper/ArinvoicesMapper.java
index 7fdcd7e8..8b48ef25 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/mapper/ArinvoicesMapper.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/mapper/ArinvoicesMapper.java
@@ -1,6 +1,7 @@
 package jnpf.arinvoices.mapper;
 
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import jnpf.arinvoices.entity.ArinvoicesEntity;
@@ -20,5 +21,5 @@ import org.apache.ibatis.annotations.Param;
  */
 public interface ArinvoicesMapper extends BaseMapper<ArinvoicesEntity> {
 
-    IPage<ArinvoicesEntity> queryArinvoices(@Param("page") Page<ArinvoicesEntity> page, @Param("arinvoicesPagination") ArinvoicesPagination arinvoicesPagination);
+    IPage<ArinvoicesEntity> queryArinvoices(@Param("page") Page<ArinvoicesEntity> page, @Param("arinvoicesPagination") ArinvoicesPagination arinvoicesPagination, @Param("ew") Wrapper<ArinvoicesEntity> queryWrapper);
 }
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/service/impl/ArinvoicesServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/service/impl/ArinvoicesServiceImpl.java
index cd55d48c..de97c5da 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/service/impl/ArinvoicesServiceImpl.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/service/impl/ArinvoicesServiceImpl.java
@@ -77,6 +77,7 @@ public class ArinvoicesServiceImpl extends ServiceImpl<ArinvoicesMapper, Arinvoi
         int total=0;
 		int arinvoicesNum =0;
         QueryWrapper<ArinvoicesEntity> arinvoicesQueryWrapper=new QueryWrapper<>();
+        arinvoicesQueryWrapper.eq("a.delete_mark", "0");
 		int arinvoices_item0Num =0;
         QueryWrapper<Arinvoices_item0Entity> arinvoices_item0QueryWrapper=new QueryWrapper<>();
 		int arinvoices_item1Num =0;
@@ -86,7 +87,7 @@ public class ArinvoicesServiceImpl extends ServiceImpl<ArinvoicesMapper, Arinvoi
     boolean	isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
     if(isPc && pcPermission){
 		if (!userProvider.get().getIsAdministrator()){
-				Object arinvoicesObj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoicesQueryWrapper,arinvoicesPagination.getMenuId(),"jg_arinvoices"));
+				Object arinvoicesObj=authorizeService.getCondition2(new AuthorizeConditionModel(arinvoicesQueryWrapper,arinvoicesPagination.getMenuId(),"jg_arinvoices"));
             if (ObjectUtil.isEmpty(arinvoicesObj)){
                 return new ArrayList<>();
             } else {
@@ -111,7 +112,7 @@ public class ArinvoicesServiceImpl extends ServiceImpl<ArinvoicesMapper, Arinvoi
     }
     if(!isPc && appPermission){
 		if (!userProvider.get().getIsAdministrator()){
-			Object arinvoicesObj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoicesQueryWrapper,arinvoicesPagination.getMenuId(),"jg_arinvoices"));
+			Object arinvoicesObj=authorizeService.getCondition2(new AuthorizeConditionModel(arinvoicesQueryWrapper,arinvoicesPagination.getMenuId(),"jg_arinvoices"));
             if (ObjectUtil.isEmpty(arinvoicesObj)){
                 return new ArrayList<>();
             } else {
@@ -140,23 +141,6 @@ public class ArinvoicesServiceImpl extends ServiceImpl<ArinvoicesMapper, Arinvoi
 
 		}
     }
-			if(StringUtil.isNotEmpty(arinvoicesPagination.getDocumentNo())){
-            arinvoicesNum++;
-            arinvoicesQueryWrapper.lambda().like(ArinvoicesEntity::getDocumentNo,arinvoicesPagination.getDocumentNo());
-                    }
-
-			if(StringUtil.isNotEmpty(arinvoicesPagination.getBusinessDate())){
-            arinvoicesNum++;
-            List<String> BusinessDateList =  arinvoicesPagination.getBusinessDate();
-            Long fir = Long.valueOf(BusinessDateList.get(0));
-            Long sec = Long.valueOf(BusinessDateList.get(1));
-                arinvoicesPagination.setStartDate(new Date(fir));
-                arinvoicesPagination.setEndDate(DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59"));
-//                arinvoicesQueryWrapper.lambda().ge(ArinvoicesEntity::getBusinessDate, new Date(fir))
-//            .le(ArinvoicesEntity::getBusinessDate, DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59"));
-
-                    }
-
         if(AllIdList.size()>0){
             arinvoicesQueryWrapper.lambda().in(ArinvoicesEntity::getId, AllIdList);
         }
@@ -197,7 +181,7 @@ public class ArinvoicesServiceImpl extends ServiceImpl<ArinvoicesMapper, Arinvoi
         if (StringUtil.isNotNull(detpartment)) {
             arinvoicesPagination.setDepartmentId(detpartment);
         }
-        IPage<ArinvoicesEntity> userIPage=arinvoicesMapper.queryArinvoices(page, arinvoicesPagination);
+        IPage<ArinvoicesEntity> userIPage=arinvoicesMapper.queryArinvoices(page, arinvoicesPagination, arinvoicesQueryWrapper);
         return arinvoicesPagination.setData(userIPage.getRecords(),userIPage.getTotal());
     }
     @Override
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/collection/mapper/CollectionMapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/collection/mapper/CollectionMapper.java
index 92c5e892..25fd7116 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/collection/mapper/CollectionMapper.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/collection/mapper/CollectionMapper.java
@@ -1,8 +1,10 @@
 package jnpf.collection.mapper;
 
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import jnpf.arinvoices.entity.ArinvoicesEntity;
 import jnpf.collection.entity.CollectionEntity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import jnpf.collection.model.collection.CollectionPagination;
@@ -29,5 +31,5 @@ public interface CollectionMapper extends BaseMapper<CollectionEntity> {
 
     List<ContractFileEntity> queryContract(String code);
 
-    IPage<CollectionEntity> queryCollection(@Param("page") Page<CollectionEntity> page, @Param("collectionPagination") CollectionPagination collectionPagination);
+    IPage<CollectionEntity> queryCollection(@Param("page") Page<CollectionEntity> page, @Param("collectionPagination") CollectionPagination collectionPagination, @Param("ew") Wrapper<CollectionEntity> queryWrapper);
 }
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/collection/service/impl/CollectionServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/collection/service/impl/CollectionServiceImpl.java
index 2760a031..80b89adf 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/collection/service/impl/CollectionServiceImpl.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/collection/service/impl/CollectionServiceImpl.java
@@ -85,6 +85,7 @@ public class CollectionServiceImpl extends ServiceImpl<CollectionMapper, Collect
         int total=0;
         int collectionNum =0;
         QueryWrapper<CollectionEntity> collectionQueryWrapper=new QueryWrapper<>();
+        collectionQueryWrapper.eq("a.delete_mark", "0");
         int collection_item0Num =0;
         QueryWrapper<Collection_item0Entity> collection_item0QueryWrapper=new QueryWrapper<>();
         boolean pcPermission = true;
@@ -92,7 +93,7 @@ public class CollectionServiceImpl extends ServiceImpl<CollectionMapper, Collect
         boolean    isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
         if(isPc && pcPermission){
             if (!userProvider.get().getIsAdministrator()){
-                Object collectionObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionQueryWrapper,collectionPagination.getMenuId(),"jg_collection"));
+                Object collectionObj=authorizeService.getCondition2(new AuthorizeConditionModel(collectionQueryWrapper,collectionPagination.getMenuId(),"jg_collection"));
                 if (ObjectUtil.isEmpty(collectionObj)){
                     return new ArrayList<>();
                 } else {
@@ -110,7 +111,7 @@ public class CollectionServiceImpl extends ServiceImpl<CollectionMapper, Collect
         }
         if(!isPc && appPermission){
             if (!userProvider.get().getIsAdministrator()){
-                Object collectionObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionQueryWrapper,collectionPagination.getMenuId(),"jg_collection"));
+                Object collectionObj=authorizeService.getCondition2(new AuthorizeConditionModel(collectionQueryWrapper,collectionPagination.getMenuId(),"jg_collection"));
                 if (ObjectUtil.isEmpty(collectionObj)){
                     return new ArrayList<>();
                 } else {
@@ -130,11 +131,6 @@ public class CollectionServiceImpl extends ServiceImpl<CollectionMapper, Collect
 
             }
         }
-        if(StringUtil.isNotEmpty(collectionPagination.getDocumentNo())){
-            collectionNum++;
-            collectionQueryWrapper.lambda().like(CollectionEntity::getDocumentNo,collectionPagination.getDocumentNo());
-        }
-
         if(AllIdList.size()>0){
             collectionQueryWrapper.lambda().in(CollectionEntity::getId, AllIdList);
         }
@@ -176,7 +172,7 @@ public class CollectionServiceImpl extends ServiceImpl<CollectionMapper, Collect
         if (StringUtil.isNotNull(detpartment)) {
             collectionPagination.setDepartmentId(detpartment);
         }
-        IPage<CollectionEntity> userIPage=collectionMapper.queryCollection(page, collectionPagination);
+        IPage<CollectionEntity> userIPage=collectionMapper.queryCollection(page, collectionPagination, collectionQueryWrapper);
         return collectionPagination.setData(userIPage.getRecords(),userIPage.getTotal());
     }
     @Override
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/invoices/mapper/InvoicesMapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/invoices/mapper/InvoicesMapper.java
index 56d619b0..8ef92f43 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/invoices/mapper/InvoicesMapper.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/invoices/mapper/InvoicesMapper.java
@@ -1,8 +1,10 @@
 package jnpf.invoices.mapper;
 
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import jnpf.collection.entity.CollectionEntity;
 import jnpf.invoices.entity.InvoicesEntity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import jnpf.invoices.model.invoices.InvoicesPagination;
@@ -18,5 +20,5 @@ import org.apache.ibatis.annotations.Param;
  */
 public interface InvoicesMapper extends BaseMapper<InvoicesEntity> {
 
-    IPage<InvoicesEntity> queryByKeyword(@Param("page") Page<InvoicesEntity> page, @Param("invoicesPagination") InvoicesPagination invoicesPagination);
+    IPage<InvoicesEntity> queryByKeyword(@Param("page") Page<InvoicesEntity> page, @Param("invoicesPagination") InvoicesPagination invoicesPagination, @Param("ew") Wrapper<InvoicesEntity> queryWrapper);
 }
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/invoices/service/impl/InvoicesServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/invoices/service/impl/InvoicesServiceImpl.java
index 6ffc5dec..a45c6dc6 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/invoices/service/impl/InvoicesServiceImpl.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/invoices/service/impl/InvoicesServiceImpl.java
@@ -84,6 +84,7 @@ public class InvoicesServiceImpl extends ServiceImpl<InvoicesMapper, InvoicesEnt
         int total=0;
 		int invoicesNum =0;
         QueryWrapper<InvoicesEntity> invoicesQueryWrapper=new QueryWrapper<>();
+        invoicesQueryWrapper.eq("a.delete_mark", "0");
 		int invoicesItem0Num =0;
         QueryWrapper<InvoicesItem0Entity> invoicesItem0QueryWrapper=new QueryWrapper<>();
 		int invoicesItem1Num =0;
@@ -93,7 +94,7 @@ public class InvoicesServiceImpl extends ServiceImpl<InvoicesMapper, InvoicesEnt
     boolean	isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
     if(isPc && pcPermission){
 		if (!userProvider.get().getIsAdministrator()){
-				Object invoicesObj=authorizeService.getCondition(new AuthorizeConditionModel(invoicesQueryWrapper,invoicesPagination.getMenuId(),"jg_invoices"));
+				Object invoicesObj=authorizeService.getCondition2(new AuthorizeConditionModel(invoicesQueryWrapper,invoicesPagination.getMenuId(),"jg_invoices"));
             if (ObjectUtil.isEmpty(invoicesObj)){
                 return new ArrayList<>();
             } else {
@@ -118,7 +119,7 @@ public class InvoicesServiceImpl extends ServiceImpl<InvoicesMapper, InvoicesEnt
     }
     if(!isPc && appPermission){
 		if (!userProvider.get().getIsAdministrator()){
-			Object invoicesObj=authorizeService.getCondition(new AuthorizeConditionModel(invoicesQueryWrapper,invoicesPagination.getMenuId(),"jg_invoices"));
+			Object invoicesObj=authorizeService.getCondition2(new AuthorizeConditionModel(invoicesQueryWrapper,invoicesPagination.getMenuId(),"jg_invoices"));
             if (ObjectUtil.isEmpty(invoicesObj)){
                 return new ArrayList<>();
             } else {
@@ -189,7 +190,7 @@ public class InvoicesServiceImpl extends ServiceImpl<InvoicesMapper, InvoicesEnt
         if (StringUtil.isNotNull(detpartment)) {
             invoicesPagination.setDepartmentId(detpartment);
         }
-        IPage<InvoicesEntity> userIPage=invoicesMapper.queryByKeyword(page, invoicesPagination);
+        IPage<InvoicesEntity> userIPage=invoicesMapper.queryByKeyword(page, invoicesPagination, invoicesQueryWrapper);
         return invoicesPagination.setData(userIPage.getRecords(),userIPage.getTotal());
 
 
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/mapper/PurchasebackMapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/mapper/PurchasebackMapper.java
index 43141462..0e1c274d 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/mapper/PurchasebackMapper.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/mapper/PurchasebackMapper.java
@@ -1,8 +1,10 @@
 package jnpf.purchaseback.mapper;
 
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import jnpf.invoices.entity.InvoicesEntity;
 import jnpf.purchaseback.entity.PurchasebackEntity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import jnpf.purchaseback.model.purchaseback.PurchasebackPagination;
@@ -18,5 +20,5 @@ import org.apache.ibatis.annotations.Param;
  */
 public interface PurchasebackMapper extends BaseMapper<PurchasebackEntity> {
 
-    IPage<PurchasebackEntity> queryByKeyword(@Param("page") Page<PurchasebackEntity> page, @Param("purchasebackPagination") PurchasebackPagination purchasebackPagination);
+    IPage<PurchasebackEntity> queryByKeyword(@Param("page") Page<PurchasebackEntity> page, @Param("purchasebackPagination") PurchasebackPagination purchasebackPagination, @Param("ew") Wrapper<PurchasebackEntity> queryWrapper);
 }
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/service/impl/PurchasebackServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/service/impl/PurchasebackServiceImpl.java
index 4c36bc68..f11bfff8 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/service/impl/PurchasebackServiceImpl.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/service/impl/PurchasebackServiceImpl.java
@@ -76,6 +76,7 @@ public class PurchasebackServiceImpl extends ServiceImpl<PurchasebackMapper, Pur
         int total=0;
 		int purchasebackNum =0;
         QueryWrapper<PurchasebackEntity> purchasebackQueryWrapper=new QueryWrapper<>();
+        purchasebackQueryWrapper.eq("a.delete_mark", "0");
 		int purchaseback_item0Num =0;
         QueryWrapper<Purchaseback_item0Entity> purchaseback_item0QueryWrapper=new QueryWrapper<>();
 		int purchaseorderNum =0;
@@ -85,7 +86,7 @@ public class PurchasebackServiceImpl extends ServiceImpl<PurchasebackMapper, Pur
     boolean	isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
     if(isPc && pcPermission){
 		if (!userProvider.get().getIsAdministrator()){
-				Object purchasebackObj=authorizeService.getCondition(new AuthorizeConditionModel(purchasebackQueryWrapper,purchasebackPagination.getMenuId(),"jg_purchaseback"));
+				Object purchasebackObj=authorizeService.getCondition2(new AuthorizeConditionModel(purchasebackQueryWrapper,purchasebackPagination.getMenuId(),"jg_purchaseback"));
             if (ObjectUtil.isEmpty(purchasebackObj)){
                 return new ArrayList<>();
             } else {
@@ -110,7 +111,7 @@ public class PurchasebackServiceImpl extends ServiceImpl<PurchasebackMapper, Pur
     }
     if(!isPc && appPermission){
 		if (!userProvider.get().getIsAdministrator()){
-			Object purchasebackObj=authorizeService.getCondition(new AuthorizeConditionModel(purchasebackQueryWrapper,purchasebackPagination.getMenuId(),"jg_purchaseback"));
+			Object purchasebackObj=authorizeService.getCondition2(new AuthorizeConditionModel(purchasebackQueryWrapper,purchasebackPagination.getMenuId(),"jg_purchaseback"));
             if (ObjectUtil.isEmpty(purchasebackObj)){
                 return new ArrayList<>();
             } else {
@@ -174,7 +175,7 @@ public class PurchasebackServiceImpl extends ServiceImpl<PurchasebackMapper, Pur
         if (StringUtil.isNotNull(detpartment)) {
             purchasebackPagination.setDepartmentId(detpartment);
         }
-        IPage<PurchasebackEntity> userIPage = purchasebackMapper.queryByKeyword(page, purchasebackPagination);
+        IPage<PurchasebackEntity> userIPage = purchasebackMapper.queryByKeyword(page, purchasebackPagination, purchasebackQueryWrapper);
         return purchasebackPagination.setData(userIPage.getRecords(),userIPage.getTotal());
 			/*if(StringUtil.isNotEmpty(purchasebackPagination.getDocumentNo())){
             purchasebackNum++;
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/mapper/ReceiptoutMapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/mapper/ReceiptoutMapper.java
index 01b4f2fc..98ec749f 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/mapper/ReceiptoutMapper.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/mapper/ReceiptoutMapper.java
@@ -1,8 +1,10 @@
 package jnpf.receiptout.mapper;
 
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import jnpf.purchaseback.entity.PurchasebackEntity;
 import jnpf.receiptout.entity.ReceiptoutEntity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import jnpf.receiptout.model.receiptout.ReceiptoutPagination;
@@ -19,5 +21,5 @@ import org.apache.ibatis.annotations.Param;
  * 日期： 2023-02-24
  */
 public interface ReceiptoutMapper extends BaseMapper<ReceiptoutEntity> {
-    IPage<ReceiptoutEntity> queryReceiptout(@Param("page") Page<ReceiptoutEntity> page, @Param("receiptoutPagination") ReceiptoutPagination receiptoutPagination);
+    IPage<ReceiptoutEntity> queryReceiptout(@Param("page") Page<ReceiptoutEntity> page, @Param("receiptoutPagination") ReceiptoutPagination receiptoutPagination, @Param("ew") Wrapper<ReceiptoutEntity> queryWrapper);
 }
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/service/impl/ReceiptoutServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/service/impl/ReceiptoutServiceImpl.java
index 3fb30eca..7d206419 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/service/impl/ReceiptoutServiceImpl.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/service/impl/ReceiptoutServiceImpl.java
@@ -74,6 +74,7 @@ public class ReceiptoutServiceImpl extends ServiceImpl<ReceiptoutMapper, Receipt
         int total=0;
 		int receiptoutNum =0;
         QueryWrapper<ReceiptoutEntity> receiptoutQueryWrapper=new QueryWrapper<>();
+        receiptoutQueryWrapper.eq("a.delete_mark", "0");
 		int receiptout_item0Num =0;
         QueryWrapper<Receiptout_item0Entity> receiptout_item0QueryWrapper=new QueryWrapper<>();
     boolean pcPermission = true;
@@ -81,7 +82,7 @@ public class ReceiptoutServiceImpl extends ServiceImpl<ReceiptoutMapper, Receipt
     boolean	isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
     if(isPc && pcPermission){
 		if (!userProvider.get().getIsAdministrator()){
-				Object receiptoutObj=authorizeService.getCondition(new AuthorizeConditionModel(receiptoutQueryWrapper,receiptoutPagination.getMenuId(),"jg_receiptout"));
+				Object receiptoutObj=authorizeService.getCondition2(new AuthorizeConditionModel(receiptoutQueryWrapper,receiptoutPagination.getMenuId(),"jg_receiptout"));
             if (ObjectUtil.isEmpty(receiptoutObj)){
                 return new ArrayList<>();
             } else {
@@ -99,7 +100,7 @@ public class ReceiptoutServiceImpl extends ServiceImpl<ReceiptoutMapper, Receipt
     }
     if(!isPc && appPermission){
 		if (!userProvider.get().getIsAdministrator()){
-			Object receiptoutObj=authorizeService.getCondition(new AuthorizeConditionModel(receiptoutQueryWrapper,receiptoutPagination.getMenuId(),"jg_receiptout"));
+			Object receiptoutObj=authorizeService.getCondition2(new AuthorizeConditionModel(receiptoutQueryWrapper,receiptoutPagination.getMenuId(),"jg_receiptout"));
             if (ObjectUtil.isEmpty(receiptoutObj)){
                 return new ArrayList<>();
             } else {
@@ -119,7 +120,7 @@ public class ReceiptoutServiceImpl extends ServiceImpl<ReceiptoutMapper, Receipt
 
 		}
     }
-			if(StringUtil.isNotEmpty(receiptoutPagination.getDocumentNo())){
+		/*	if(StringUtil.isNotEmpty(receiptoutPagination.getDocumentNo())){
             receiptoutNum++;
             receiptoutQueryWrapper.lambda().like(ReceiptoutEntity::getDocumentNo,receiptoutPagination.getDocumentNo());
                     }
@@ -134,7 +135,7 @@ public class ReceiptoutServiceImpl extends ServiceImpl<ReceiptoutMapper, Receipt
             Long sec = Long.valueOf(creatorTime.get(1));
             receiptoutPagination.setStartDate(new Date(fir));
             receiptoutPagination.setEndDate(DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59"));
-        }
+        }*/
 
         if(AllIdList.size()>0){
             receiptoutQueryWrapper.lambda().in(ReceiptoutEntity::getId, AllIdList);
@@ -176,7 +177,7 @@ public class ReceiptoutServiceImpl extends ServiceImpl<ReceiptoutMapper, Receipt
         if (StringUtil.isNotNull(detpartment)) {
             receiptoutPagination.setDepartmentId(detpartment);
         }
-        IPage<ReceiptoutEntity> userIPage=receiptoutMapper.queryReceiptout(page, receiptoutPagination);
+        IPage<ReceiptoutEntity> userIPage=receiptoutMapper.queryReceiptout(page, receiptoutPagination, receiptoutQueryWrapper);
         return receiptoutPagination.setData(userIPage.getRecords(),userIPage.getTotal());
     }
     @Override
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleback/mapper/SalebackMapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleback/mapper/SalebackMapper.java
index d2c76f11..ddd085a4 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/saleback/mapper/SalebackMapper.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleback/mapper/SalebackMapper.java
@@ -1,8 +1,10 @@
 package jnpf.saleback.mapper;
 
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import jnpf.receiptout.entity.ReceiptoutEntity;
 import jnpf.saleback.entity.SalebackEntity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import jnpf.saleback.entity.Saleback_item0Entity;
@@ -23,7 +25,7 @@ import java.util.List;
  * 日期： 2023-01-13
  */
 public interface SalebackMapper extends BaseMapper<SalebackEntity> {
-    IPage<SalebackEntity> querySaleBack(@Param("page") Page<SalebackEntity> page, @Param("salebackPagination") SalebackPagination salebackPagination);
+    IPage<SalebackEntity> querySaleBack(@Param("page") Page<SalebackEntity> page, @Param("salebackPagination") SalebackPagination salebackPagination, @Param("ew") Wrapper<SalebackEntity> queryWrapper);
 
     List<Saleback_item0Entity> querySaleBackItem(String id);
 }
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleback/service/impl/SalebackServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleback/service/impl/SalebackServiceImpl.java
index f257dd04..77946567 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/saleback/service/impl/SalebackServiceImpl.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleback/service/impl/SalebackServiceImpl.java
@@ -72,6 +72,7 @@ public class SalebackServiceImpl extends ServiceImpl<SalebackMapper, SalebackEnt
         int total=0;
 		int salebackNum =0;
         QueryWrapper<SalebackEntity> salebackQueryWrapper=new QueryWrapper<>();
+        salebackQueryWrapper.eq("a.delete_mark", "0");
 		int saleback_item0Num =0;
         QueryWrapper<Saleback_item0Entity> saleback_item0QueryWrapper=new QueryWrapper<>();
 
@@ -80,7 +81,7 @@ public class SalebackServiceImpl extends ServiceImpl<SalebackMapper, SalebackEnt
     boolean	isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
     if(isPc && pcPermission){
 		if (!userProvider.get().getIsAdministrator()){
-				Object salebackObj=authorizeService.getCondition(new AuthorizeConditionModel(salebackQueryWrapper,salebackPagination.getMenuId(),"jg_saleback"));
+				Object salebackObj=authorizeService.getCondition2(new AuthorizeConditionModel(salebackQueryWrapper,salebackPagination.getMenuId(),"jg_saleback"));
             if (ObjectUtil.isEmpty(salebackObj)){
                 return new ArrayList<>();
             } else {
@@ -98,7 +99,7 @@ public class SalebackServiceImpl extends ServiceImpl<SalebackMapper, SalebackEnt
     }
     if(!isPc && appPermission){
 		if (!userProvider.get().getIsAdministrator()){
-			Object salebackObj=authorizeService.getCondition(new AuthorizeConditionModel(salebackQueryWrapper,salebackPagination.getMenuId(),"jg_saleback"));
+			Object salebackObj=authorizeService.getCondition2(new AuthorizeConditionModel(salebackQueryWrapper,salebackPagination.getMenuId(),"jg_saleback"));
             if (ObjectUtil.isEmpty(salebackObj)){
                 return new ArrayList<>();
             } else {
@@ -119,20 +120,6 @@ public class SalebackServiceImpl extends ServiceImpl<SalebackMapper, SalebackEnt
 
 		}
     }
-			if(StringUtil.isNotEmpty(salebackPagination.getDocumentNo())){
-            salebackNum++;
-            salebackQueryWrapper.lambda().like(SalebackEntity::getDocumentNo,salebackPagination.getDocumentNo());
-                    }
-        if(StringUtil.isNotEmpty(salebackPagination.getCreatorTime())){
-            List<String> creatorTime =  salebackPagination.getCreatorTime();
-            Long fir = Long.valueOf(creatorTime.get(0));
-            Long sec = Long.valueOf(creatorTime.get(1));
-            salebackPagination.setStartDate(new Date(fir));
-            salebackPagination.setEndDate(DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59"));
-//                saleorderitemQueryWrapper.lambda().ge(SaleorderitemEntity::getCreatorTime, new Date(fir))
-//                    .le(SaleorderitemEntity::getCreatorTime, DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59"));
-
-        }
 
         if(AllIdList.size()>0){
             salebackQueryWrapper.lambda().in(SalebackEntity::getId, AllIdList);
@@ -174,7 +161,7 @@ public class SalebackServiceImpl extends ServiceImpl<SalebackMapper, SalebackEnt
         if (StringUtil.isNotNull(detpartment)) {
                 salebackPagination.setDepartmentId(detpartment);
         }
-        IPage<SalebackEntity> userIPage=salebackMapper.querySaleBack(page, salebackPagination);
+        IPage<SalebackEntity> userIPage=salebackMapper.querySaleBack(page, salebackPagination, salebackQueryWrapper);
         return salebackPagination.setData(userIPage.getRecords(),userIPage.getTotal());
     }
     @Override
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/mapper/SaleorderitemMapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/mapper/SaleorderitemMapper.java
index 3d6a7aa4..0ead4595 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/mapper/SaleorderitemMapper.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/mapper/SaleorderitemMapper.java
@@ -1,12 +1,14 @@
 package jnpf.saleorder.mapper;
 
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import jnpf.arinvoices.entity.ArinvoicesEntity;
 import jnpf.poundlist.entity.PoundlistEntity;
 import jnpf.poundlist.model.poundlist.PoundlistPagination;
 import jnpf.receiptout.entity.Receiptout_item0Entity;
+import jnpf.saleback.entity.SalebackEntity;
 import jnpf.saleorder.entity.SaleorderitemEntity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import jnpf.saleorder.entity.Salesorder_item0Entity;
@@ -24,7 +26,7 @@ import java.util.List;
  * 日期： 2023-02-22
  */
 public interface SaleorderitemMapper extends BaseMapper<SaleorderitemEntity> {
-    IPage<SaleorderitemEntity> querySalesOrder(@Param("page") Page<SaleorderitemEntity> page, @Param("saleorderitemPagination") SaleorderitemPagination saleorderitemPagination);
+    IPage<SaleorderitemEntity> querySalesOrder(@Param("page") Page<SaleorderitemEntity> page, @Param("saleorderitemPagination") SaleorderitemPagination saleorderitemPagination, @Param("ew") Wrapper<SaleorderitemEntity> queryWrapper);
     PoundlistEntity queryPoundlist(String poundlistId);
     List<Salesorder_item0Entity> querySaleOrderItem(String id);
     List<Receiptout_item0Entity> queryReceiptoutItem(String id);
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/SaleorderitemServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/SaleorderitemServiceImpl.java
index b3c89a31..89cc105a 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/SaleorderitemServiceImpl.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/SaleorderitemServiceImpl.java
@@ -93,6 +93,7 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
         int total=0;
 		int saleorderitemNum =0;
         QueryWrapper<SaleorderitemEntity> saleorderitemQueryWrapper=new QueryWrapper<>();
+        saleorderitemQueryWrapper.eq("a.delete_mark","0");
 		int salesorder_item0Num =0;
         QueryWrapper<Salesorder_item0Entity> salesorder_item0QueryWrapper=new QueryWrapper<>();
 		int receiptoutsoitemNum =0;
@@ -110,7 +111,7 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
     boolean	isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
     if(isPc && pcPermission){
 		if (!userProvider.get().getIsAdministrator()){
-				Object saleorderitemObj=authorizeService.getCondition(new AuthorizeConditionModel(saleorderitemQueryWrapper,saleorderitemPagination.getMenuId(),"jg_saleorder"));
+				Object saleorderitemObj=authorizeService.getCondition2(new AuthorizeConditionModel(saleorderitemQueryWrapper,saleorderitemPagination.getMenuId(),"jg_saleorder"));
             if (ObjectUtil.isEmpty(saleorderitemObj)){
                 return new ArrayList<>();
             } else {
@@ -163,7 +164,7 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
     }
     if(!isPc && appPermission){
 		if (!userProvider.get().getIsAdministrator()){
-			Object saleorderitemObj=authorizeService.getCondition(new AuthorizeConditionModel(saleorderitemQueryWrapper,saleorderitemPagination.getMenuId(),"jg_saleorder"));
+			Object saleorderitemObj=authorizeService.getCondition2(new AuthorizeConditionModel(saleorderitemQueryWrapper,saleorderitemPagination.getMenuId(),"jg_saleorder"));
             if (ObjectUtil.isEmpty(saleorderitemObj)){
                 return new ArrayList<>();
             } else {
@@ -228,27 +229,6 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
 
 		}
     }
-			if(StringUtil.isNotEmpty(saleorderitemPagination.getDocumentNo())){
-            saleorderitemNum++;
-            saleorderitemQueryWrapper.lambda().like(SaleorderitemEntity::getDocumentNo,saleorderitemPagination.getDocumentNo());
-                    }
-
-			if(StringUtil.isNotEmpty(saleorderitemPagination.getStatus())){
-            saleorderitemNum++;
-                saleorderitemQueryWrapper.lambda().eq(SaleorderitemEntity::getStatus,saleorderitemPagination.getStatus());
-                    }
-			if(StringUtil.isNotEmpty(saleorderitemPagination.getCreatorTime())){
-            saleorderitemNum++;
-            List<String> creatorTime =  saleorderitemPagination.getCreatorTime();
-            Long fir = Long.valueOf(creatorTime.get(0));
-            Long sec = Long.valueOf(creatorTime.get(1));
-            saleorderitemPagination.setStartDate(new Date(fir));
-            saleorderitemPagination.setEndDate(DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59"));
-                saleorderitemQueryWrapper.lambda().ge(SaleorderitemEntity::getCreatorTime, new Date(fir))
-                    .le(SaleorderitemEntity::getCreatorTime, DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59"));
-
-        }
-
         if(AllIdList.size()>0){
             saleorderitemQueryWrapper.lambda().in(SaleorderitemEntity::getId, AllIdList);
         }
@@ -291,7 +271,7 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
         }
 
 
-        IPage<SaleorderitemEntity> userIPage=saleorderitemMapper.querySalesOrder(page, saleorderitemPagination);
+        IPage<SaleorderitemEntity> userIPage=saleorderitemMapper.querySalesOrder(page, saleorderitemPagination, saleorderitemQueryWrapper);
         return saleorderitemPagination.setData(userIPage.getRecords(),userIPage.getTotal());
     }
     @Override
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/mapper/TradeuploadMapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/mapper/TradeuploadMapper.java
index d15d5c73..7946928c 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/mapper/TradeuploadMapper.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/mapper/TradeuploadMapper.java
@@ -4,6 +4,7 @@ package jnpf.tradeupload.mapper;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import jnpf.saleorder.entity.SaleorderitemEntity;
 import jnpf.tradeupload.entity.TradeuploadEntity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import jnpf.tradeupload.model.tradeupload.TradeuploadPagination;
@@ -23,5 +24,5 @@ import java.util.List;
 public interface TradeuploadMapper extends BaseMapper<TradeuploadEntity> {
     List<TradeuploadEntity> queryVehicle(TradeuploadEntity tradeuploadEntity);
 
-    IPage<TradeuploadEntity> queryByKeyword(@Param("page") Page<TradeuploadEntity> page, @Param("tradeuploadPagination") TradeuploadPagination tradeuploadPagination);
+    IPage<TradeuploadEntity> queryByKeyword(@Param("page") Page<TradeuploadEntity> page, @Param("tradeuploadPagination") TradeuploadPagination tradeuploadPagination, @Param("ew") Wrapper<TradeuploadEntity> queryWrapper);
 }
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/service/impl/TradeuploadServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/service/impl/TradeuploadServiceImpl.java
index ef5d66b7..400b3429 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/service/impl/TradeuploadServiceImpl.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/service/impl/TradeuploadServiceImpl.java
@@ -86,14 +86,14 @@ public class TradeuploadServiceImpl extends ServiceImpl<TradeuploadMapper, Trade
         int total=0;
 		int tradeuploadNum =0;
         QueryWrapper<TradeuploadEntity> tradeuploadQueryWrapper=new QueryWrapper<>();
-        tradeuploadQueryWrapper.lambda().eq(TradeuploadEntity::getIsExamine,"0");
-        tradeuploadQueryWrapper.lambda().eq(TradeuploadEntity::getPoundType,"0");
+        tradeuploadQueryWrapper.eq("a.is_examine","0");
+        tradeuploadQueryWrapper.eq("a.delete_mark","0");
     boolean pcPermission = true;
     boolean appPermission = true;
     boolean	isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
     if(isPc && pcPermission){
 		if (!userProvider.get().getIsAdministrator()){
-				Object tradeuploadObj=authorizeService.getCondition(new AuthorizeConditionModel(tradeuploadQueryWrapper,tradeuploadPagination.getMenuId(),"jg_poundlist"));
+				Object tradeuploadObj=authorizeService.getCondition2(new AuthorizeConditionModel(tradeuploadQueryWrapper,tradeuploadPagination.getMenuId(),"jg_poundlist"));
             if (ObjectUtil.isEmpty(tradeuploadObj)){
                 return new ArrayList<>();
             } else {
@@ -104,7 +104,7 @@ public class TradeuploadServiceImpl extends ServiceImpl<TradeuploadMapper, Trade
     }
     if(!isPc && appPermission){
 		if (!userProvider.get().getIsAdministrator()){
-			Object tradeuploadObj=authorizeService.getCondition(new AuthorizeConditionModel(tradeuploadQueryWrapper,tradeuploadPagination.getMenuId(),"jg_poundlist"));
+			Object tradeuploadObj=authorizeService.getCondition2(new AuthorizeConditionModel(tradeuploadQueryWrapper,tradeuploadPagination.getMenuId(),"jg_poundlist"));
             if (ObjectUtil.isEmpty(tradeuploadObj)){
                 return new ArrayList<>();
             } else {
@@ -165,7 +165,7 @@ public class TradeuploadServiceImpl extends ServiceImpl<TradeuploadMapper, Trade
         }
 
 //        tradeuploadPagination.setDepartmentId(detpartment);
-        IPage<TradeuploadEntity> userIPage = tradeuploadMapper.queryByKeyword(page, tradeuploadPagination);
+        IPage<TradeuploadEntity> userIPage = tradeuploadMapper.queryByKeyword(page, tradeuploadPagination, tradeuploadQueryWrapper);
         return tradeuploadPagination.setData(userIPage.getRecords(),userIPage.getTotal());
     /*
 
diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/arinvoices/ArinvoicesMapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/arinvoices/ArinvoicesMapper.xml
index c7a5505d..1115689a 100644
--- a/SC-boot/linkage-scm/src/main/resources/mapper/arinvoices/ArinvoicesMapper.xml
+++ b/SC-boot/linkage-scm/src/main/resources/mapper/arinvoices/ArinvoicesMapper.xml
@@ -13,15 +13,7 @@
     	LEFT JOIN jg_customer b ON a.customer_id = b.id and b.delete_mark = '0'
     	LEFT JOIN jg_contract c ON a.contract_id = c.id and c.delete_mark = '0'
     	LEFT JOIN jg_salesorder d ON a.sales_order_id = d.id and d.delete_mark = '0'
-    WHERE 1=1
-    and a.delete_mark = '0'
-    /*添加权限*/
-    <if test="arinvoicesPagination.departmentId != null and arinvoicesPagination.departmentId != ''">
-        AND a.department_id = #{arinvoicesPagination.departmentId}
-    </if>
-    <if test="arinvoicesPagination.orgnizeId != null and arinvoicesPagination.orgnizeId != ''">
-        AND a.orgnize_id = #{arinvoicesPagination.orgnizeId}
-    </if>
+    ${ew.customSqlSegment}
     <if test="arinvoicesPagination.documentNo != null and arinvoicesPagination.documentNo != ''">
         and a.document_no  LIKE CONCAT('%',#{arinvoicesPagination.documentNo},'%')
     </if>
diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/collection/CollectionMapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/collection/CollectionMapper.xml
index 34e4b5b2..9464d445 100644
--- a/SC-boot/linkage-scm/src/main/resources/mapper/collection/CollectionMapper.xml
+++ b/SC-boot/linkage-scm/src/main/resources/mapper/collection/CollectionMapper.xml
@@ -17,15 +17,7 @@
 	    jg_collection a
 	    LEFT JOIN jg_customer b ON a.customer_id = b.id and b.delete_mark = '0'
 	    LEFT JOIN jg_contract c ON a.contract_id = c.id and c.delete_mark = '0'
-	    where 1=1
-        and a.delete_mark = '0'
-        /*添加权限*/
-        <if test="collectionPagination.departmentId != null and collectionPagination.departmentId != ''">
-            AND a.department_id = #{collectionPagination.departmentId}
-        </if>
-        <if test="collectionPagination.orgnizeId != null and collectionPagination.orgnizeId != ''">
-            AND a.orgnize_id = #{collectionPagination.orgnizeId}
-        </if>
+        ${ew.customSqlSegment}
         <if test="collectionPagination.documentNo != null and collectionPagination.documentNo != ''">
             and a.document_no  LIKE CONCAT('%',#{collectionPagination.documentNo},'%')
         </if>
diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/invoices/InvoicesMapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/invoices/InvoicesMapper.xml
index d4c44223..02ea8639 100644
--- a/SC-boot/linkage-scm/src/main/resources/mapper/invoices/InvoicesMapper.xml
+++ b/SC-boot/linkage-scm/src/main/resources/mapper/invoices/InvoicesMapper.xml
@@ -7,14 +7,7 @@
         LEFT JOIN jg_purchaseorder b on a.purchaseorder_id = b.id
         LEFT JOIN jg_contract c on a.contract_id = c.id
         LEFT JOIN jg_supplier d on a.supplier_id = d.id
-        where 1=1 AND a.delete_mark = 0 AND b.delete_mark = 0 AND c.delete_mark = 0 AND d.delete_mark = 0
-        /*添加权限*/
-        <if test="invoicesPagination.departmentId != null and invoicesPagination.departmentId != ''">
-            AND a.department_id = #{invoicesPagination.departmentId}
-        </if>
-        <if test="invoicesPagination.orgnizeId != null and invoicesPagination.orgnizeId != ''">
-            AND a.orgnize_id = #{invoicesPagination.orgnizeId}
-        </if>
+        ${ew.customSqlSegment} AND b.delete_mark = 0 AND c.delete_mark = 0 AND d.delete_mark = 0
         <if test="invoicesPagination.startDate != null and invoicesPagination.endDate != null">
             AND a.creator_time &gt; #{invoicesPagination.startDate} AND a.creator_time &lt;= #{invoicesPagination.endDate}
         </if>
diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/purchaseback/PurchasebackMapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/purchaseback/PurchasebackMapper.xml
index 65b70a09..8def19d9 100644
--- a/SC-boot/linkage-scm/src/main/resources/mapper/purchaseback/PurchasebackMapper.xml
+++ b/SC-boot/linkage-scm/src/main/resources/mapper/purchaseback/PurchasebackMapper.xml
@@ -7,16 +7,7 @@
         LEFT JOIN jg_purchaseorder b on a.purchase_order_id = b.id
         LEFT JOIN jg_contract c on b.contract_code = c.id
         LEFT JOIN jg_supplier d on b.supplier_id = d.id
-        where 1=1 and a.delete_mark = 0 and b.delete_mark = 0 and c.delete_mark = 0 and d.delete_mark = 0
-
-        /*添加权限*/
-        <if test="purchasebackPagination.departmentId != null and purchasebackPagination.departmentId != ''">
-            AND a.department_id = #{purchasebackPagination.departmentId}
-        </if>
-        <if test="purchasebackPagination.orgnizeId != null and purchasebackPagination.orgnizeId != ''">
-            AND a.orgnize_id = #{purchasebackPagination.orgnizeId}
-        </if>
-
+        ${ew.customSqlSegment} and b.delete_mark = 0 and c.delete_mark = 0 and d.delete_mark = 0
         <if test="purchasebackPagination.documentNo != null and purchasebackPagination.documentNo != ''">
             AND a.document_no LIKE CONCAT('%',#{purchasebackPagination.documentNo},'%')
         </if>
diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/receiptout/ReceiptoutMapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/receiptout/ReceiptoutMapper.xml
index 375bc289..151fda5e 100644
--- a/SC-boot/linkage-scm/src/main/resources/mapper/receiptout/ReceiptoutMapper.xml
+++ b/SC-boot/linkage-scm/src/main/resources/mapper/receiptout/ReceiptoutMapper.xml
@@ -11,15 +11,7 @@
     jg_receiptout a
     LEFT JOIN jg_customer b on a.customer_id = b.id and b.delete_mark = '0'
     LEFT JOIN jg_salesorder c on a.source_no = c.id and c.delete_mark = '0'
-    where 1=1
-    and a.delete_mark = '0'
-    /*添加权限*/
-    <if test="receiptoutPagination.departmentId != null and receiptoutPagination.departmentId != ''">
-        AND a.department_id = #{receiptoutPagination.departmentId}
-    </if>
-    <if test="receiptoutPagination.orgnizeId != null and receiptoutPagination.orgnizeId != ''">
-        AND a.orgnize_id = #{receiptoutPagination.orgnizeId}
-    </if>
+    ${ew.customSqlSegment}
     <if test="receiptoutPagination.documentNo != null and receiptoutPagination.documentNo != ''">
         and a.document_no  LIKE CONCAT('%',#{receiptoutPagination.documentNo},'%')
     </if>
diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/saleback/SalebackMapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/saleback/SalebackMapper.xml
index b7468ef1..823b80cc 100644
--- a/SC-boot/linkage-scm/src/main/resources/mapper/saleback/SalebackMapper.xml
+++ b/SC-boot/linkage-scm/src/main/resources/mapper/saleback/SalebackMapper.xml
@@ -12,15 +12,7 @@
         LEFT JOIN jg_salesorder b on a.sales_order_id = b.id and b.delete_mark = '0'
         LEFT JOIN jg_contract c on b.contract_id = c.id and c.delete_mark = '0'
         LEFT JOIN jg_customer d on b.customer_id = d.id and d.delete_mark = '0'
-        where 1 = 1
-        and a.delete_mark = '0'
-        /*添加权限*/
-        <if test="salebackPagination.departmentId != null and salebackPagination.departmentId != ''">
-            AND a.department_id = #{salebackPagination.departmentId}
-        </if>
-        <if test="salebackPagination.orgnizeId != null and salebackPagination.orgnizeId != ''">
-            AND a.orgnize_id = #{salebackPagination.orgnizeId}
-        </if>
+        ${ew.customSqlSegment}
         <if test="salebackPagination.documentNo != null and salebackPagination.documentNo != ''">
             and a.document_no  LIKE CONCAT('%',#{salebackPagination.documentNo},'%')
         </if>
diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/salesorderitem/SaleorderMapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/salesorderitem/SaleorderMapper.xml
index 18713691..a0ab44ba 100644
--- a/SC-boot/linkage-scm/src/main/resources/mapper/salesorderitem/SaleorderMapper.xml
+++ b/SC-boot/linkage-scm/src/main/resources/mapper/salesorderitem/SaleorderMapper.xml
@@ -11,15 +11,7 @@
     jg_salesorder a
     left join jg_contract b on a.contract_id = b.id  and b.delete_mark = '0'
     left join jg_customer c on a.customer_id = c.id  and c.delete_mark = '0'
-    where 1=1
-    and a.delete_mark = '0'
-    /*添加权限*/
-    <if test="saleorderitemPagination.departmentId != null and saleorderitemPagination.departmentId != ''">
-        AND a.department_id = #{saleorderitemPagination.departmentId}
-    </if>
-    <if test="saleorderitemPagination.orgnizeId != null and saleorderitemPagination.orgnizeId != ''">
-        AND a.orgnize_id = #{saleorderitemPagination.orgnizeId}
-    </if>
+    ${ew.customSqlSegment}
     <if test="saleorderitemPagination.documentNo != null and saleorderitemPagination.documentNo != ''">
         and a.document_no  LIKE CONCAT('%',#{saleorderitemPagination.documentNo},'%')
     </if>
diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/tradeupload/TradeuploadMapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/tradeupload/TradeuploadMapper.xml
index 125c552f..f1e6b70b 100644
--- a/SC-boot/linkage-scm/src/main/resources/mapper/tradeupload/TradeuploadMapper.xml
+++ b/SC-boot/linkage-scm/src/main/resources/mapper/tradeupload/TradeuploadMapper.xml
@@ -26,14 +26,7 @@ creator_time = DATE_SUB(NOW(),interval 15 day)
         LEFT JOIN jg_contract g on a.purchase_id = g.id
         LEFT JOIN base_user h on a.business_id = h.f_id
         LEFT JOIN jg_natural i on a.natural_id = i.id
-        where a.is_examine = '0' AND a.delete_mark = 0
-        /*添加权限*/
-        <if test="tradeuploadPagination.departmentId != null and tradeuploadPagination.departmentId != ''">
-            AND a.department_id = #{tradeuploadPagination.departmentId}
-        </if>
-        <if test="tradeuploadPagination.orgnizeId != null and tradeuploadPagination.orgnizeId != ''">
-            AND a.orgnize_id = #{tradeuploadPagination.orgnizeId}
-        </if>
+        ${ew.customSqlSegment}
         <if test="tradeuploadPagination.keyword != null and tradeuploadPagination.keyword != ''">
             AND (b.ticketno LIKE CONCAT('%',#{tradeuploadPagination.keyword},'%') OR c.supplier_name LIKE CONCAT('%',#{tradeuploadPagination.keyword},'%') OR d.supplier_nm LIKE CONCAT('%',#{tradeuploadPagination.keyword},'%'))
         </if>