添加权限

SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/model/arinvoices/ArinvoicesPagination.java

@@ -32,6 +32,13 @@ public class ArinvoicesPagination extends Pagination {
         private Date endDate;
         /** 业务日期 */
         private List<String> businessDate;
+
+        /**
+         * 添加权限
+         */
+        private String departmentId;
+        private String orgnizeId;
+
 	/**
     * 菜单id
     */

SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/service/impl/ArinvoicesServiceImpl.java

@@ -4,6 +4,7 @@ import jnpf.arinvoices.entity.*;
 import jnpf.arinvoices.mapper.ArinvoicesMapper;
 import jnpf.arinvoices.service.*;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import jnpf.collection.entity.CollectionEntity;
 import jnpf.util.RandomUtil;
 import java.math.BigDecimal;
 import cn.hutool.core.util.ObjectUtil;
@@ -173,6 +174,14 @@ public class ArinvoicesServiceImpl extends ServiceImpl<ArinvoicesMapper, Arinvoi
             }
         }
         Page<ArinvoicesEntity> page=new Page<>(arinvoicesPagination.getCurrentPage(), arinvoicesPagination.getPageSize());
+        //加权限
+        IPage<ArinvoicesEntity> IPage = this.page(page, arinvoicesQueryWrapper);
+        List<ArinvoicesEntity> list = IPage.getRecords();
+        Optional<ArinvoicesEntity> firstElement = list.stream().findFirst();
+        String deId = firstElement.flatMap(list1 -> firstElement.filter(Objects::nonNull))
+                .map(ArinvoicesEntity::getDepartmentId)
+                .orElse(null);
+        arinvoicesPagination.setDepartmentId(deId);
         IPage<ArinvoicesEntity> userIPage=arinvoicesMapper.queryArinvoices(page, arinvoicesPagination);
         return arinvoicesPagination.setData(userIPage.getRecords(),userIPage.getTotal());
     }

SC-boot/linkage-scm/src/main/java/jnpf/collection/model/collection/CollectionPagination.java

@@ -21,6 +21,12 @@ public class CollectionPagination extends Pagination {
     private String contractNm;
 
     private String customerNm;
+    /**
+     * 添加权限
+     */
+    private String departmentId;
+    private String orgnizeId;
+
 	/**
     * 菜单id
     */

SC-boot/linkage-scm/src/main/java/jnpf/collection/service/impl/CollectionServiceImpl.java

@@ -75,57 +75,57 @@ public class CollectionServiceImpl extends ServiceImpl<CollectionMapper, Collect
         String userId=userProvider.get().getUserId();
         List<String> AllIdList =new ArrayList();
         int total=0;
-		int collectionNum =0;
+        int collectionNum =0;
         QueryWrapper<CollectionEntity> collectionQueryWrapper=new QueryWrapper<>();
-		int collection_item0Num =0;
+        int collection_item0Num =0;
         QueryWrapper<Collection_item0Entity> collection_item0QueryWrapper=new QueryWrapper<>();
-    boolean pcPermission = true;
-    boolean appPermission = true;
-    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"));
-            if (ObjectUtil.isEmpty(collectionObj)){
-                return new ArrayList<>();
-            } else {
-                collectionQueryWrapper = (QueryWrapper<CollectionEntity>)collectionObj;
-                collectionNum++;
+        boolean pcPermission = true;
+        boolean appPermission = true;
+        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"));
+                if (ObjectUtil.isEmpty(collectionObj)){
+                    return new ArrayList<>();
+                } else {
+                    collectionQueryWrapper = (QueryWrapper<CollectionEntity>)collectionObj;
+                    collectionNum++;
+                }
+                Object collection_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(collection_item0QueryWrapper,collectionPagination.getMenuId(),"jg_collection_item0"));
+                if (ObjectUtil.isEmpty(collection_item0Obj)){
+                    return new ArrayList<>();
+                } else {
+                    collection_item0QueryWrapper = (QueryWrapper<Collection_item0Entity>)collection_item0Obj;
+                    collection_item0Num++;
+                }
             }
-				Object collection_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(collection_item0QueryWrapper,collectionPagination.getMenuId(),"jg_collection_item0"));
-            if (ObjectUtil.isEmpty(collection_item0Obj)){
-                return new ArrayList<>();
-            } else {
-                collection_item0QueryWrapper = (QueryWrapper<Collection_item0Entity>)collection_item0Obj;
-                collection_item0Num++;
+        }
+        if(!isPc && appPermission){
+            if (!userProvider.get().getIsAdministrator()){
+                Object collectionObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionQueryWrapper,collectionPagination.getMenuId(),"jg_collection"));
+                if (ObjectUtil.isEmpty(collectionObj)){
+                    return new ArrayList<>();
+                } else {
+                    collectionQueryWrapper = (QueryWrapper<CollectionEntity>)collectionObj;
+                    collectionNum++;
+                }
+
+
+                Object collection_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(collection_item0QueryWrapper,collectionPagination.getMenuId(),"jg_collection_item0"));
+                if (ObjectUtil.isEmpty(collection_item0Obj)){
+                    return new ArrayList<>();
+                } else {
+                    collection_item0QueryWrapper = (QueryWrapper<Collection_item0Entity>)collection_item0Obj;
+                    collection_item0Num++;
+                }
+
+
             }
         }
-    }
-    if(!isPc && appPermission){
-		if (!userProvider.get().getIsAdministrator()){
-			Object collectionObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionQueryWrapper,collectionPagination.getMenuId(),"jg_collection"));
-            if (ObjectUtil.isEmpty(collectionObj)){
-                return new ArrayList<>();
-            } else {
-            collectionQueryWrapper = (QueryWrapper<CollectionEntity>)collectionObj;
-             collectionNum++;
-			}
-
-
-			Object collection_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(collection_item0QueryWrapper,collectionPagination.getMenuId(),"jg_collection_item0"));
-            if (ObjectUtil.isEmpty(collection_item0Obj)){
-                return new ArrayList<>();
-            } else {
-            collection_item0QueryWrapper = (QueryWrapper<Collection_item0Entity>)collection_item0Obj;
-             collection_item0Num++;
-			}
-
-
-		}
-    }
-			if(StringUtil.isNotEmpty(collectionPagination.getDocumentNo())){
+        if(StringUtil.isNotEmpty(collectionPagination.getDocumentNo())){
             collectionNum++;
             collectionQueryWrapper.lambda().like(CollectionEntity::getDocumentNo,collectionPagination.getDocumentNo());
-                    }
+        }
 
         if(AllIdList.size()>0){
             collectionQueryWrapper.lambda().in(CollectionEntity::getId, AllIdList);
@@ -148,6 +148,14 @@ public class CollectionServiceImpl extends ServiceImpl<CollectionMapper, Collect
             }
         }
         Page<CollectionEntity> page=new Page<>(collectionPagination.getCurrentPage(), collectionPagination.getPageSize());
+        //加权限
+        IPage<CollectionEntity> IPage = this.page(page, collectionQueryWrapper);
+        List<CollectionEntity> list = IPage.getRecords();
+        Optional<CollectionEntity> firstElement = list.stream().findFirst();
+        String deId = firstElement.flatMap(list1 -> firstElement.filter(Objects::nonNull))
+                .map(CollectionEntity::getDepartmentId)
+                .orElse(null);
+        collectionPagination.setDepartmentId(deId);
         IPage<CollectionEntity> userIPage=collectionMapper.queryCollection(page, collectionPagination);
         return collectionPagination.setData(userIPage.getRecords(),userIPage.getTotal());
     }
@@ -155,73 +163,73 @@ public class CollectionServiceImpl extends ServiceImpl<CollectionMapper, Collect
     public List<CollectionEntity> getTypeList(CollectionPagination collectionPagination,String dataType){
         String userId=userProvider.get().getUserId();
         List<String> AllIdList =new ArrayList();
-		int total=0;
-		int collectionNum =0;
+        int total=0;
+        int collectionNum =0;
         QueryWrapper<CollectionEntity> collectionQueryWrapper=new QueryWrapper<>();
-		int collection_item0Num =0;
+        int collection_item0Num =0;
         QueryWrapper<Collection_item0Entity> collection_item0QueryWrapper=new QueryWrapper<>();
-    boolean pcPermission = true;
-    boolean appPermission = true;
-    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"));
-            if (ObjectUtil.isEmpty(collectionObj)){
-                return new ArrayList<>();
-            } else {
-                collectionQueryWrapper = (QueryWrapper<CollectionEntity>)collectionObj;
-                collectionNum++;
+        boolean pcPermission = true;
+        boolean appPermission = true;
+        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"));
+                if (ObjectUtil.isEmpty(collectionObj)){
+                    return new ArrayList<>();
+                } else {
+                    collectionQueryWrapper = (QueryWrapper<CollectionEntity>)collectionObj;
+                    collectionNum++;
+                }
+                Object collection_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(collection_item0QueryWrapper,collectionPagination.getMenuId(),"jg_collection_item0"));
+                if (ObjectUtil.isEmpty(collection_item0Obj)){
+                    return new ArrayList<>();
+                } else {
+                    collection_item0QueryWrapper = (QueryWrapper<Collection_item0Entity>)collection_item0Obj;
+                    collection_item0Num++;
+                }
             }
-				Object collection_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(collection_item0QueryWrapper,collectionPagination.getMenuId(),"jg_collection_item0"));
-            if (ObjectUtil.isEmpty(collection_item0Obj)){
-                return new ArrayList<>();
-            } else {
-                collection_item0QueryWrapper = (QueryWrapper<Collection_item0Entity>)collection_item0Obj;
-                collection_item0Num++;
+        }
+        if(!isPc && appPermission){
+            if (!userProvider.get().getIsAdministrator()){
+                Object collectionObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionQueryWrapper,collectionPagination.getMenuId(),"jg_collection"));
+                if (ObjectUtil.isEmpty(collectionObj)){
+                    return new ArrayList<>();
+                } else {
+                    collectionQueryWrapper = (QueryWrapper<CollectionEntity>)collectionObj;
+                    collectionNum++;
+                }
+
+
+                Object collection_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(collection_item0QueryWrapper,collectionPagination.getMenuId(),"jg_collection_item0"));
+                if (ObjectUtil.isEmpty(collection_item0Obj)){
+                    return new ArrayList<>();
+                } else {
+                    collection_item0QueryWrapper = (QueryWrapper<Collection_item0Entity>)collection_item0Obj;
+                    collection_item0Num++;
+                }
+
+
             }
         }
-    }
-    if(!isPc && appPermission){
-		if (!userProvider.get().getIsAdministrator()){
-			Object collectionObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionQueryWrapper,collectionPagination.getMenuId(),"jg_collection"));
-            if (ObjectUtil.isEmpty(collectionObj)){
-                return new ArrayList<>();
-            } else {
-            collectionQueryWrapper = (QueryWrapper<CollectionEntity>)collectionObj;
-             collectionNum++;
-			}
-
-
-			Object collection_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(collection_item0QueryWrapper,collectionPagination.getMenuId(),"jg_collection_item0"));
-            if (ObjectUtil.isEmpty(collection_item0Obj)){
-                return new ArrayList<>();
-            } else {
-            collection_item0QueryWrapper = (QueryWrapper<Collection_item0Entity>)collection_item0Obj;
-             collection_item0Num++;
-			}
-
-
-		}
-    }
-			if(StringUtil.isNotEmpty(collectionPagination.getDocumentNo())){
+        if(StringUtil.isNotEmpty(collectionPagination.getDocumentNo())){
             collectionNum++;
             collectionQueryWrapper.lambda().like(CollectionEntity::getDocumentNo,collectionPagination.getDocumentNo());
-                    }
+        }
 
-		if(AllIdList.size()>0){
-        collectionQueryWrapper.lambda().in(CollectionEntity::getId, AllIdList);
-				}
+        if(AllIdList.size()>0){
+            collectionQueryWrapper.lambda().in(CollectionEntity::getId, AllIdList);
+        }
         //排序
         if(StringUtil.isEmpty(collectionPagination.getSidx())){
-        collectionQueryWrapper.lambda().orderByDesc(CollectionEntity::getId);
+            collectionQueryWrapper.lambda().orderByDesc(CollectionEntity::getId);
         }else{
             try {
-            	String sidx = collectionPagination.getSidx();
+                String sidx = collectionPagination.getSidx();
                 CollectionEntity collectionEntity = new CollectionEntity();
-				Field declaredField = collectionEntity.getClass().getDeclaredField(sidx);
-				declaredField.setAccessible(true);
-				String value = declaredField.getAnnotation(TableField.class).value();
-                 collectionQueryWrapper="asc".equals(collectionPagination.getSort().toLowerCase())?collectionQueryWrapper.orderByAsc(value):collectionQueryWrapper.orderByDesc(value);
+                Field declaredField = collectionEntity.getClass().getDeclaredField(sidx);
+                declaredField.setAccessible(true);
+                String value = declaredField.getAnnotation(TableField.class).value();
+                collectionQueryWrapper="asc".equals(collectionPagination.getSort().toLowerCase())?collectionQueryWrapper.orderByAsc(value):collectionQueryWrapper.orderByDesc(value);
             } catch (NoSuchFieldException e) {
                 e.printStackTrace();
             }
@@ -264,12 +272,12 @@ public class CollectionServiceImpl extends ServiceImpl<CollectionMapper, Collect
         }
     }
     //子表方法
-		@Override
-		public List<Collection_item0Entity> GetCollection_item0List(String id){
-				QueryWrapper<Collection_item0Entity> queryWrapper = new QueryWrapper<>();
-				queryWrapper.lambda().eq(Collection_item0Entity::getCollectionId, id);
-				return collection_item0Service.list(queryWrapper);
-				}
+    @Override
+    public List<Collection_item0Entity> GetCollection_item0List(String id){
+        QueryWrapper<Collection_item0Entity> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(Collection_item0Entity::getCollectionId, id);
+        return collection_item0Service.list(queryWrapper);
+    }
 
     @Override
     public PoundlistEntity queryPoundInfo(String poundlistId) {
@@ -297,4 +305,4 @@ public class CollectionServiceImpl extends ServiceImpl<CollectionMapper, Collect
     //列表子表数据方法
 
 
-}
+}

SC-boot/linkage-scm/src/main/java/jnpf/invoices/model/invoices/InvoicesPagination.java

@@ -26,6 +26,13 @@ public class InvoicesPagination extends Pagination {
     private List<String> creatorTime;
     private Date startDate;
     private Date endDate;
+
+    /**
+     * 添加权限
+     */
+    private String departmentId;
+    private String orgnizeId;
+
 	/**
     * 菜单id
     */

SC-boot/linkage-scm/src/main/java/jnpf/invoices/service/impl/InvoicesServiceImpl.java

@@ -1,5 +1,6 @@
 package jnpf.invoices.service.impl;
 
+import jnpf.collection.entity.CollectionEntity;
 import jnpf.contractfile.entity.ContractFileEntity;
 import jnpf.contractfile.service.ContractFileService;
 import jnpf.invoices.entity.*;
@@ -165,8 +166,17 @@ public class InvoicesServiceImpl extends ServiceImpl<InvoicesMapper, InvoicesEnt
             }
         }
         Page<InvoicesEntity> page=new Page<>(invoicesPagination.getCurrentPage(), invoicesPagination.getPageSize());
-        IPage<InvoicesEntity> iPage = invoicesMapper.queryByKeyword(page, invoicesPagination);
-        return invoicesPagination.setData(iPage.getRecords(),iPage.getTotal());
+        //加权限
+        IPage<InvoicesEntity> IPage = this.page(page, invoicesQueryWrapper);
+        List<InvoicesEntity> list = IPage.getRecords();
+        Optional<InvoicesEntity> firstElement = list.stream().findFirst();
+        String deId = firstElement.flatMap(list1 -> firstElement.filter(Objects::nonNull))
+                .map(InvoicesEntity::getDepartmentId)
+                .orElse(null);
+        invoicesPagination.setDepartmentId(deId);
+        IPage<InvoicesEntity> userIPage=invoicesMapper.queryByKeyword(page, invoicesPagination);
+
+        return invoicesPagination.setData(userIPage.getRecords(),userIPage.getTotal());
 
 
 

SC-boot/linkage-scm/src/main/java/jnpf/poundlist/model/poundlist/PoundlistPagination.java

@@ -42,7 +42,11 @@ public class PoundlistPagination extends Pagination {
     private String salesOrderId;
     private List<String> poundlistIds;
 
+    /**
+     * 添加权限
+     */
     private String departmentId;
+    private String orgnizeId;
     /**
      * 菜单id
      */

SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/model/purchaseback/PurchasebackPagination.java

@@ -18,6 +18,13 @@ public class PurchasebackPagination extends Pagination {
 
         /** 单据编号 */
         private String documentNo;
+
+    /**
+     * 添加权限
+     */
+    private String departmentId;
+    private String orgnizeId;
+
 	/**
     * 菜单id
     */

SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/service/impl/PurchasebackServiceImpl.java

@@ -6,6 +6,7 @@ import jnpf.purchaseback.entity.*;
 import jnpf.purchaseback.mapper.PurchasebackMapper;
 import jnpf.purchaseback.service.*;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import jnpf.receiptin.entity.ReceiptinEntity;
 import jnpf.util.RandomUtil;
 import java.math.BigDecimal;
 import cn.hutool.core.util.ObjectUtil;
@@ -150,8 +151,16 @@ public class PurchasebackServiceImpl extends ServiceImpl<PurchasebackMapper, Pur
             }
         }
         Page<PurchasebackEntity> page=new Page<>(purchasebackPagination.getCurrentPage(), purchasebackPagination.getPageSize());
-        IPage<PurchasebackEntity> iPage = purchasebackMapper.queryByKeyword(page, purchasebackPagination);
-        return purchasebackPagination.setData(iPage.getRecords(),iPage.getTotal());
+        //加权限
+        IPage<PurchasebackEntity> IPage = this.page(page, purchasebackQueryWrapper);
+        List<PurchasebackEntity> list = IPage.getRecords();
+        Optional<PurchasebackEntity> firstElement = list.stream().findFirst();
+        String deId = firstElement.flatMap(list1 -> firstElement.filter(Objects::nonNull))
+                .map(PurchasebackEntity::getDepartmentId)
+                .orElse(null);
+        purchasebackPagination.setDepartmentId(deId);
+        IPage<PurchasebackEntity> userIPage = purchasebackMapper.queryByKeyword(page, purchasebackPagination);
+        return purchasebackPagination.setData(userIPage.getRecords(),userIPage.getTotal());
 			/*if(StringUtil.isNotEmpty(purchasebackPagination.getDocumentNo())){
             purchasebackNum++;
             purchasebackQueryWrapper.lambda().like(PurchasebackEntity::getDocumentNo,purchasebackPagination.getDocumentNo());

SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderPagination.java

@@ -26,6 +26,13 @@ public class PurchaseorderPagination extends Pagination {
     private String status;
     private Date startDate;
     private Date endDate;
+
+    /**
+     * 添加权限
+     */
+    private String departmentId;
+    private String orgnizeId;
+
     /**
      * 菜单id
      */

SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PurchaseorderitemServiceImpl.java

@@ -35,6 +35,7 @@ import jnpf.permission.service.AuthorizeService;
 import jnpf.poundlist.entity.PoundlistEntity;
 import jnpf.poundlist.mapper.PoundlistMapper;
 import jnpf.poundlist.service.PoundlistService;
+import jnpf.purchaseback.entity.PurchasebackEntity;
 import jnpf.purchaseorder.entity.*;
 import jnpf.purchaseorder.mapper.Purchaseorder_item0Mapper;
 import jnpf.purchaseorder.mapper.PurchaseorderitemMapper;
@@ -873,8 +874,16 @@ public class PurchaseorderitemServiceImpl extends ServiceImpl<PurchaseorderitemM
             }
         }
         Page<PurchaseorderitemEntity> page = new Page<>(purchaseorderPagination.getCurrentPage(), purchaseorderPagination.getPageSize());
-        IPage<PurchaseorderitemEntity> iPage = purchaseorderitemMapper.queryByKeyword(page, purchaseorderPagination);
-        return purchaseorderPagination.setData(iPage.getRecords(), iPage.getTotal());
+        //加权限
+        IPage<PurchaseorderitemEntity> IPage = this.page(page, purchaseorderQueryWrapper);
+        List<PurchaseorderitemEntity> list = IPage.getRecords();
+        Optional<PurchaseorderitemEntity> firstElement = list.stream().findFirst();
+        String deId = firstElement.flatMap(list1 -> firstElement.filter(Objects::nonNull))
+                .map(PurchaseorderitemEntity::getDepartmentId)
+                .orElse(null);
+        purchaseorderPagination.setDepartmentId(deId);
+        IPage<PurchaseorderitemEntity> userIPage = purchaseorderitemMapper.queryByKeyword(page, purchaseorderPagination);
+        return purchaseorderPagination.setData(userIPage.getRecords(), userIPage.getTotal());
 
 
 

SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/ReceiptinPagination.java

@@ -29,6 +29,12 @@ public class ReceiptinPagination extends Pagination {
     private List<String> creatorTime;
     private Date startDate;
     private Date endDate;
+
+    /**
+     * 添加权限
+     */
+    private String departmentId;
+    private String orgnizeId;
     /**
      * 菜单id
      */

SC-boot/linkage-scm/src/main/java/jnpf/receiptin/service/impl/ReceiptinServiceImpl.java

@@ -6,6 +6,7 @@ import jnpf.receiptin.entity.*;
 import jnpf.receiptin.mapper.ReceiptinMapper;
 import jnpf.receiptin.service.*;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import jnpf.receiptout.entity.ReceiptoutEntity;
 import jnpf.supplier.entity.SupplierEntity;
 import jnpf.supplier.service.SupplierService;
 import jnpf.util.RandomUtil;
@@ -139,8 +140,16 @@ public class ReceiptinServiceImpl extends ServiceImpl<ReceiptinMapper, Receiptin
             }
         }
         Page<ReceiptinEntity> page=new Page<>(receiptinPagination.getCurrentPage(), receiptinPagination.getPageSize());
-        IPage<ReceiptinEntity> iPage = receiptinMapper.queryByKeyword(page, receiptinPagination);
-        return receiptinPagination.setData(iPage.getRecords(),iPage.getTotal());
+        //加权限
+        IPage<ReceiptinEntity> IPage = this.page(page, receiptinQueryWrapper);
+        List<ReceiptinEntity> list = IPage.getRecords();
+        Optional<ReceiptinEntity> firstElement = list.stream().findFirst();
+        String deId = firstElement.flatMap(list1 -> firstElement.filter(Objects::nonNull))
+                .map(ReceiptinEntity::getDepartmentId)
+                .orElse(null);
+        receiptinPagination.setDepartmentId(deId);
+        IPage<ReceiptinEntity> userIPage = receiptinMapper.queryByKeyword(page, receiptinPagination);
+        return receiptinPagination.setData(userIPage.getRecords(),userIPage.getTotal());
 			/*if(StringUtil.isNotEmpty(receiptinPagination.getDocumentno())){
             receiptinNum++;
             receiptinQueryWrapper.lambda().like(ReceiptinEntity::getDocumentno,receiptinPagination.getDocumentno());

SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutPagination.java

@@ -31,6 +31,13 @@ public class ReceiptoutPagination extends Pagination {
         private String sourceOrderNo;
         private Date startDate;
         private Date endDate;
+
+        /**
+         * 添加权限
+         */
+        private String departmentId;
+        private String orgnizeId;
+
 	/**
     * 菜单id
     */

SC-boot/linkage-scm/src/main/java/jnpf/receiptout/service/impl/ReceiptoutServiceImpl.java

@@ -1,5 +1,6 @@
 package jnpf.receiptout.service.impl;
 
+import jnpf.arinvoices.entity.ArinvoicesEntity;
 import jnpf.receiptout.entity.*;
 import jnpf.receiptout.mapper.ReceiptoutMapper;
 import jnpf.receiptout.service.*;
@@ -152,6 +153,14 @@ public class ReceiptoutServiceImpl extends ServiceImpl<ReceiptoutMapper, Receipt
             }
         }
         Page<ReceiptoutEntity> page=new Page<>(receiptoutPagination.getCurrentPage(), receiptoutPagination.getPageSize());
+        //加权限
+        IPage<ReceiptoutEntity> IPage = this.page(page, receiptoutQueryWrapper);
+        List<ReceiptoutEntity> list = IPage.getRecords();
+        Optional<ReceiptoutEntity> firstElement = list.stream().findFirst();
+        String deId = firstElement.flatMap(list1 -> firstElement.filter(Objects::nonNull))
+                .map(ReceiptoutEntity::getDepartmentId)
+                .orElse(null);
+        receiptoutPagination.setDepartmentId(deId);
         IPage<ReceiptoutEntity> userIPage=receiptoutMapper.queryReceiptout(page, receiptoutPagination);
         return receiptoutPagination.setData(userIPage.getRecords(),userIPage.getTotal());
     }

SC-boot/linkage-scm/src/main/java/jnpf/saleback/model/saleback/SalebackPagination.java

@@ -28,6 +28,12 @@ public class SalebackPagination extends Pagination {
 
         private Date startDate;
         private Date endDate;
+
+    /**
+     * 添加权限
+     */
+    private String departmentId;
+    private String orgnizeId;
 	/**
     * 菜单id
     */

SC-boot/linkage-scm/src/main/java/jnpf/saleback/service/impl/SalebackServiceImpl.java

@@ -1,5 +1,6 @@
 package jnpf.saleback.service.impl;
 
+import jnpf.receiptout.entity.ReceiptoutEntity;
 import jnpf.saleback.entity.*;
 import jnpf.saleback.mapper.SalebackMapper;
 import jnpf.saleback.model.saleback.Saleback_item0Model;
@@ -150,6 +151,14 @@ public class SalebackServiceImpl extends ServiceImpl<SalebackMapper, SalebackEnt
             }
         }
         Page<SalebackEntity> page=new Page<>(salebackPagination.getCurrentPage(), salebackPagination.getPageSize());
+        //加权限
+        IPage<SalebackEntity> IPage = this.page(page, salebackQueryWrapper);
+        List<SalebackEntity> list = IPage.getRecords();
+        Optional<SalebackEntity> firstElement = list.stream().findFirst();
+        String deId = firstElement.flatMap(list1 -> firstElement.filter(Objects::nonNull))
+                .map(SalebackEntity::getDepartmentId)
+                .orElse(null);
+        salebackPagination.setDepartmentId(deId);
         IPage<SalebackEntity> userIPage=salebackMapper.querySaleBack(page, salebackPagination);
         return salebackPagination.setData(userIPage.getRecords(),userIPage.getTotal());
     }

SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SaleorderitemPagination.java

@@ -31,6 +31,13 @@ public class SaleorderitemPagination extends Pagination {
         private Date endDate;
 
         private List<String> creatorTime;
+
+        /**
+         * 添加权限
+         */
+        private String departmentId;
+        private String orgnizeId;
+
 	/**
     * 菜单id
     */

SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/SaleorderitemServiceImpl.java

@@ -3,6 +3,7 @@ package jnpf.saleorder.service.impl;
 import jnpf.arinvoices.entity.ArinvoicesEntity;
 import jnpf.poundlist.entity.PoundlistEntity;
 import jnpf.poundlist.service.PoundlistService;
+import jnpf.receiptout.entity.ReceiptoutEntity;
 import jnpf.receiptout.entity.Receiptout_item0Entity;
 import jnpf.receiptout.service.Receiptout_item0Service;
 import jnpf.saleorder.entity.*;
@@ -267,6 +268,14 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
             }
         }
         Page<SaleorderitemEntity> page=new Page<>(saleorderitemPagination.getCurrentPage(), saleorderitemPagination.getPageSize());
+        //加权限
+        IPage<SaleorderitemEntity> IPage = this.page(page, saleorderitemQueryWrapper);
+        List<SaleorderitemEntity> list = IPage.getRecords();
+        Optional<SaleorderitemEntity> firstElement = list.stream().findFirst();
+        String deId = firstElement.flatMap(list1 -> firstElement.filter(Objects::nonNull))
+                .map(SaleorderitemEntity::getDepartmentId)
+                .orElse(null);
+        saleorderitemPagination.setDepartmentId(deId);
         IPage<SaleorderitemEntity> userIPage=saleorderitemMapper.querySalesOrder(page, saleorderitemPagination);
         return saleorderitemPagination.setData(userIPage.getRecords(),userIPage.getTotal());
     }

SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/model/tradeupload/TradeuploadPagination.java

@@ -41,6 +41,13 @@ public class TradeuploadPagination extends Pagination {
 
     private Date startDate;
     private Date endDate;
+
+    /**
+     * 添加权限
+     */
+    private String departmentId;
+    private String orgnizeId;
+
     /**
      * 菜单id
      */

SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/service/impl/TradeuploadServiceImpl.java

@@ -8,6 +8,7 @@ import jnpf.materialvo.entity.MaterialEntity;
 import jnpf.materialvo.service.MaterialService;
 import jnpf.permission.entity.UserEntity;
 import jnpf.permission.service.UserService;
+import jnpf.saleorder.entity.SaleorderitemEntity;
 import jnpf.tradeupload.entity.*;
 import jnpf.tradeupload.mapper.TradeuploadMapper;
 import jnpf.tradeupload.service.*;
@@ -131,8 +132,16 @@ public class TradeuploadServiceImpl extends ServiceImpl<TradeuploadMapper, Trade
             }
         }
         Page<TradeuploadEntity> page=new Page<>(tradeuploadPagination.getCurrentPage(), tradeuploadPagination.getPageSize());
-        IPage<TradeuploadEntity> iPage = tradeuploadMapper.queryByKeyword(page, tradeuploadPagination);
-        return tradeuploadPagination.setData(iPage.getRecords(),iPage.getTotal());
+        //加权限
+        IPage<TradeuploadEntity> IPage = this.page(page, tradeuploadQueryWrapper);
+        List<TradeuploadEntity> list = IPage.getRecords();
+        Optional<TradeuploadEntity> firstElement = list.stream().findFirst();
+        String deId = firstElement.flatMap(list1 -> firstElement.filter(Objects::nonNull))
+                .map(TradeuploadEntity::getDepartmentId)
+                .orElse(null);
+        tradeuploadPagination.setDepartmentId(deId);
+        IPage<TradeuploadEntity> userIPage = tradeuploadMapper.queryByKeyword(page, tradeuploadPagination);
+        return tradeuploadPagination.setData(userIPage.getRecords(),userIPage.getTotal());
     /*
 
 

SC-boot/linkage-scm/src/main/resources/mapper/arinvoices/ArinvoicesMapper.xml

@@ -15,6 +15,13 @@
     	LEFT JOIN jg_salesorder d ON a.sales_order_id = d.id
     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>
     <if test="arinvoicesPagination.documentNo != null and arinvoicesPagination.documentNo != ''">
         and a.document_no  LIKE CONCAT('%',#{arinvoicesPagination.documentNo},'%')
     </if>

SC-boot/linkage-scm/src/main/resources/mapper/collection/CollectionMapper.xml

@@ -10,15 +10,22 @@
 
     <select id="queryCollection" resultType="jnpf.collection.entity.CollectionEntity">
         SELECT
-	    a.*,
-	    b.supplier_nm customerNm,
-	    c.contract_name contractNm
+        a.*,
+        b.supplier_nm customerNm,
+        c.contract_name contractNm
         FROM
-	    jg_collection a
-	    LEFT JOIN jg_customer b ON a.customer_id = b.id
-	    LEFT JOIN jg_contract c ON a.contract_id = c.id
-	    where 1=1
+        jg_collection a
+        LEFT JOIN jg_customer b ON a.customer_id = b.id
+        LEFT JOIN jg_contract c ON a.contract_id = c.id
+        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>
         <if test="collectionPagination.documentNo != null and collectionPagination.documentNo != ''">
             and a.document_no  LIKE CONCAT('%',#{collectionPagination.documentNo},'%')
         </if>

SC-boot/linkage-scm/src/main/resources/mapper/invoices/InvoicesMapper.xml

@@ -2,12 +2,19 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="jnpf.invoices.mapper.InvoicesMapper">
     <select id="queryByKeyword" resultType="jnpf.invoices.entity.InvoicesEntity">
-        SELECT a.*,b.document_no purchaseorderId,c.contract_name contractId,d.supplier_name supplierId 
-        from jg_invoices a 
+        SELECT a.*,b.document_no purchaseorderId,c.contract_name contractId,d.supplier_name supplierId
+        from jg_invoices a
         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>
         <if test="invoicesPagination.startDate != null and invoicesPagination.endDate != null">
             AND a.creator_time &gt; #{invoicesPagination.startDate} AND a.creator_time &lt;= #{invoicesPagination.endDate}
         </if>

SC-boot/linkage-scm/src/main/resources/mapper/poundlist/PoundlistMapper.xml

@@ -89,6 +89,9 @@ WHERE a.delete_mark = 0 and b.delete_mark = 0 and c.delete_mark = 0 and d.delete
 		<if test="poundlistPagination.departmentId != null and poundlistPagination.departmentId != ''">
 			AND a.department_id = #{poundlistPagination.departmentId}
 		</if>
+		<if test="poundlistPagination.orgnizeId != null and poundlistPagination.orgnizeId != ''">
+			AND a.orgnize_id = #{poundlistPagination.orgnizeId}
+		</if>
 		<if test="poundlistPagination.isCollection != null and poundlistPagination.isCollection != ''">
 			AND a.is_collection = #{poundlistPagination.isCollection}
 		</if>

SC-boot/linkage-scm/src/main/resources/mapper/purchaseback/PurchasebackMapper.xml

@@ -8,6 +8,15 @@
         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>
+
         <if test="purchasebackPagination.documentNo != null and purchasebackPagination.documentNo != ''">
             AND a.document_no LIKE CONCAT('%',#{purchasebackPagination.documentNo},'%')
         </if>

SC-boot/linkage-scm/src/main/resources/mapper/purchaseorder/PurchaseorderMapper.xml

@@ -220,6 +220,14 @@
         LEFT JOIN jg_supplier b on a.supplier_id = b.id
         LEFT JOIN jg_contract c on a.contract_code = c.id
         WHERE 1=1 and a.delete_mark = 0 and b.delete_mark = 0 and c.delete_mark = 0
+        /*添加权限*/
+        <if test="purchaseorderPagination.departmentId != null and purchaseorderPagination.departmentId != ''">
+            AND a.department_id = #{purchaseorderPagination.departmentId}
+        </if>
+        <if test="purchaseorderPagination.orgnizeId != null and purchaseorderPagination.orgnizeId != ''">
+            AND a.orgnize_id = #{purchaseorderPagination.orgnizeId}
+        </if>
+
         <if test="purchaseorderPagination.keyword != null and purchaseorderPagination.keyword != ''">
             AND (c.contract_name LIKE CONCAT('%',#{purchaseorderPagination.keyword},'%') OR b.supplier_name LIKE CONCAT('%',#{purchaseorderPagination.keyword},'%'))
         </if>

SC-boot/linkage-scm/src/main/resources/mapper/receiptin/ReceiptinMapper.xml

@@ -7,6 +7,13 @@
         LEFT JOIN jg_purchaseorder b on a.souceno = b.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 d.delete_mark = 0
+        /*添加权限*/
+        <if test="receiptinPagination.departmentId != null and receiptinPagination.departmentId != ''">
+            AND a.department_id = #{receiptinPagination.departmentId}
+        </if>
+        <if test="receiptinPagination.orgnizeId != null and receiptinPagination.orgnizeId != ''">
+            AND a.orgnize_id = #{receiptinPagination.orgnizeId}
+        </if>
         <if test="receiptinPagination.startDate != null and receiptinPagination.endDate != null">
             AND a.creator_time &gt; #{receiptinPagination.startDate} AND a.creator_time &lt;= #{receiptinPagination.endDate}
         </if>

SC-boot/linkage-scm/src/main/resources/mapper/receiptout/ReceiptoutMapper.xml

@@ -13,6 +13,14 @@
     LEFT JOIN jg_salesorder c on a.source_no = c.id
     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>
+
     <if test="receiptoutPagination.documentNo != null and receiptoutPagination.documentNo != ''">
         and a.document_no  LIKE CONCAT('%',#{receiptoutPagination.documentNo},'%')
     </if>

SC-boot/linkage-scm/src/main/resources/mapper/saleback/SalebackMapper.xml

@@ -14,6 +14,13 @@
         LEFT JOIN jg_customer d on b.customer_id = d.id
         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>
         <if test="salebackPagination.documentNo != null and salebackPagination.documentNo != ''">
             and a.document_no  LIKE CONCAT('%',#{salebackPagination.documentNo},'%')
         </if>

SC-boot/linkage-scm/src/main/resources/mapper/salesorderitem/SaleorderMapper.xml

@@ -13,6 +13,13 @@
     left join jg_customer c on a.customer_id = c.id
     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>
     <if test="saleorderitemPagination.documentNo != null and saleorderitemPagination.documentNo != ''">
         and a.document_no  LIKE CONCAT('%',#{saleorderitemPagination.documentNo},'%')
     </if>

SC-boot/linkage-scm/src/main/resources/mapper/tradeupload/TradeuploadMapper.xml

@@ -27,6 +27,13 @@ creator_time = DATE_SUB(NOW(),interval 15 day)
         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>
         <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>