feat(order):列表添加鉴权;

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/RecycleBucketServiceImpl.java

@@ -5,18 +5,26 @@ import jnpf.mapper.RecycleBucketMapper;
 import jnpf.service.*;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import jnpf.model.recyclebucket.*;
+
 import java.math.BigDecimal;
+
 import cn.hutool.core.util.ObjectUtil;
 import jnpf.permission.model.authorize.AuthorizeConditionModel;
 import jnpf.util.GeneraterSwapUtil;
 import jnpf.database.model.superQuery.SuperQueryJsonModel;
 import jnpf.database.model.superQuery.ConditionJsonModel;
 import jnpf.database.model.superQuery.SuperQueryConditionModel;
+
 import java.lang.reflect.Field;
+
 import com.baomidou.mybatisplus.annotation.TableField;
+
 import java.util.regex.Pattern;
+
 import jnpf.model.QueryModel;
+
 import java.util.stream.Collectors;
+
 import jnpf.base.model.ColumnDataModel;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -25,13 +33,17 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+
 import java.text.SimpleDateFormat;
+
 import jnpf.util.*;
+
 import java.util.*;
+
 import jnpf.base.UserInfo;
 import jnpf.permission.entity.UserEntity;
+
 /**
- *
  * 回收桶配置
  * 版本： V3.5
  * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
@@ -50,7 +62,10 @@ public class RecycleBucketServiceImpl extends ServiceImpl<RecycleBucketMapper, R
     public List<RecycleBucketEntity> getList(RecycleBucketPagination recycleBucketPagination) {
         return getTypeList(recycleBucketPagination, recycleBucketPagination.getDataType());
     }
-    /** 列表查询 */
+
+    /**
+     * 列表查询
+     */
     @Override
     public List<RecycleBucketEntity> getTypeList(RecycleBucketPagination recycleBucketPagination, String dataType) {
         String userId = userProvider.get().getUserId();
@@ -250,6 +265,9 @@ public class RecycleBucketServiceImpl extends ServiceImpl<RecycleBucketMapper, R
                 e.printStackTrace();
             }
         }
+        if (!userProvider.get().getIsAdministrator()) {
+            recycleBucketQueryWrapper.lambda().eq(RecycleBucketEntity::getCompanyId, userProvider.get().getOrganizeId());
+        }
 
         if ("0".equals(dataType)) {
             if ((total > 0 && AllIdList.size() > 0) || total == 0) {
@@ -264,27 +282,34 @@ public class RecycleBucketServiceImpl extends ServiceImpl<RecycleBucketMapper, R
             return this.list(recycleBucketQueryWrapper);
         }
     }
+
     @Override
     public RecycleBucketEntity getInfo(String id) {
         QueryWrapper<RecycleBucketEntity> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda().eq(RecycleBucketEntity::getId, id);
         return this.getOne(queryWrapper);
     }
+
     @Override
     public void create(RecycleBucketEntity entity) {
         this.save(entity);
     }
+
     @Override
     public boolean update(String id, RecycleBucketEntity entity) {
         return this.updateById(entity);
     }
+
     @Override
     public void delete(RecycleBucketEntity entity) {
         if (entity != null) {
             this.removeById(entity.getId());
         }
     }
-    /** 验证表单唯一字段，正则，非空 i-0新增-1修改*/
+
+    /**
+     * 验证表单唯一字段，正则，非空 i-0新增-1修改
+     */
     @Override
     public String checkForm(RecycleBucketForm form, int i) {
         boolean isUp = StringUtil.isNotEmpty(form.getId()) && !form.getId().equals("0");
@@ -296,8 +321,10 @@ public class RecycleBucketServiceImpl extends ServiceImpl<RecycleBucketMapper, R
         //主表字段验证
         return countRecover;
     }
+
     /**
      * 新增修改数据(事务回滚)
+     *
      * @param id
      * @param recycleBucketForm
      * @return

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/RecycleCleanOrderServiceImpl.java

@@ -237,6 +237,10 @@ public class RecycleCleanOrderServiceImpl extends ServiceImpl<RecycleCleanOrderM
             }
         }
 
+        if (!userProvider.get().getIsAdministrator()) {
+            recycleCleanOrderQueryWrapper.lambda().eq(RecycleCleanOrderEntity::getCompanyId, userProvider.get().getOrganizeId());
+        }
+
         if ("0".equals(dataType)) {
             if ((total > 0 && AllIdList.size() > 0) || total == 0) {
                 Page<RecycleCleanOrderEntity> page = new Page<>(recycleCleanOrderPagination.getCurrentPage(), recycleCleanOrderPagination.getPageSize());

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/RecycleDeliveryOrderServiceImpl.java

@@ -383,6 +383,10 @@ public class RecycleDeliveryOrderServiceImpl extends ServiceImpl<RecycleDelivery
             }
         }
 
+        if (!userProvider.get().getIsAdministrator()) {
+            recycleDeliveryOrderQueryWrapper.lambda().eq(RecycleDeliveryOrderEntity::getCompanyId, userProvider.get().getOrganizeId());
+        }
+
         if ("0".equals(dataType)) {
             if ((total > 0 && AllIdList.size() > 0) || total == 0) {
                 Page<RecycleDeliveryOrderEntity> page = new Page<>(recycleDeliveryOrderPagination.getCurrentPage(), recycleDeliveryOrderPagination.getPageSize());

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/RecycleDeviceServiceImpl.java

@@ -318,6 +318,10 @@ public class RecycleDeviceServiceImpl extends ServiceImpl<RecycleDeviceMapper, R
             }
         }
 
+        if (!userProvider.get().getIsAdministrator()) {
+            recycleDeviceQueryWrapper.lambda().eq(RecycleDeviceEntity::getBeLongCompanyId, userProvider.get().getOrganizeId());
+        }
+
         if ("0".equals(dataType)) {
             if ((total > 0 && AllIdList.size() > 0) || total == 0) {
                 Page<RecycleDeviceEntity> page = new Page<>(recycleDevicePagination.getCurrentPage(), recycleDevicePagination.getPageSize());