包材厂下拉框和码包分页查询数据隔离问题定位

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/impl/FactoryServiceImpl.java

@@ -1,6 +1,8 @@
 package com.abi.qms.platform.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.json.JSONUtil;
+import com.abi.base.foundation.util.JsonUtil;
 import com.abi.qms.platform.dao.entity.BaseFactory;
 import com.abi.qms.platform.dao.entity.QrBoxCodeFormat;
 import com.abi.qms.platform.dao.entity.QrPackage;
@@ -36,6 +38,7 @@ import com.abi.task.common.utils.IMathUtils;
 import com.abi.task.common.utils.PojoConverterUtils;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -53,6 +56,7 @@ import java.util.regex.Pattern;
  *
  * @author Andy.Tan
  */
+@Slf4j
 @Service
 public class FactoryServiceImpl implements FactoryService {
 
@@ -327,6 +331,8 @@ public class FactoryServiceImpl implements FactoryService {
         }
         QueryWrapper<BaseFactory> param = new QueryWrapper<>();
         //数据权限隔离，如果登录账号是包材厂，只能看账号包材厂的数据。否则看全部
+        //todo:测试定位问题
+        log.info("===包材厂下拉框查询数据隔离问题定位==》userUtil.getWholeUser()：" + JSONUtil.toJsonStr(userUtil.getWholeUser()));
         if (DataLimitEnum.YES.is(req.getDataLimit())
                 && !TrueFalseEnum.TRUE.is(userUtil.getWholeUser().getIsAbi())) {
             param.eq("id", userUtil.getWholeUser().getFactoryId());

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/impl/QrPackageServiceImpl.java

@@ -1,6 +1,7 @@
 package com.abi.qms.platform.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.json.JSONUtil;
 import com.abi.base.foundation.util.RedisClient;
 import com.abi.qms.platform.dao.entity.*;
 import com.abi.qms.platform.dao.enums.*;
@@ -413,6 +414,8 @@ public class QrPackageServiceImpl implements QrPackageService {
     @Override
     public ListQrPackageRes listQrPackage(ListQrPackageReq req) {
         //数据权限隔离，如果登录账号是包材厂，只能看账号包材厂的数据。否则看全部
+        //todo:测试定位问题
+        log.info("===码包分页查询数据隔离问题定位==》userUtil.getWholeUser()：" + JSONUtil.toJsonStr(userUtil.getWholeUser()));
         if (userUtil.getWholeUser().getFactoryId() != null && userUtil.getWholeUser().getFactoryType() != null && FactoryTypeEnum.COVER.is(userUtil.getWholeUser().getFactoryType())) {
             req.setFactoryCoverId(userUtil.getWholeUser().getFactoryId());
         }