用factoryId做数据隔离的取值方式更改。包括供应商，箱码幅面，码包等模块

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

@@ -291,8 +291,8 @@ public class FactoryServiceImpl implements FactoryService {
         ListPackageFactorySelectRes listPackageFactorySelectRes = new ListPackageFactorySelectRes();
         QueryWrapper<BaseFactory> param = new QueryWrapper<>();
         //数据权限隔离，如果登录账号是包材厂，只能看账号包材厂的数据。否则看全部
-        if (userUtil.getUser().getFactoryId() != null) {
-            param.eq("id", userUtil.getUser().getFactoryId());
+        if (userUtil.getWholeUser().getFactoryId() != null) {
+            param.eq("id", userUtil.getWholeUser().getFactoryId());
             listPackageFactorySelectRes.setLoginType(LoginTypeEnum.PACKAGE.getCode());
         } else {
             listPackageFactorySelectRes.setLoginType(LoginTypeEnum.NOT_PACKAGE.getCode());

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

@@ -63,7 +63,7 @@ public class QrBoxCodeFormatImpl implements QrBoxCodeFormatService {
         //2-箱码幅面放入数据
         qrBoxCodeFormat.setQrRepertoryId(req.getQrRepertoryId());
         //若当前登录用户为包材厂用户，则该选项默认选择该用户所在的包材厂，不可修改
-        qrBoxCodeFormat.setFactoryId(userUtil.getUser().getFactoryId() != null ? userUtil.getUser().getFactoryId() : req.getFactoryId());
+        qrBoxCodeFormat.setFactoryId(userUtil.getWholeUser().getFactoryId() != null ? userUtil.getWholeUser().getFactoryId() : req.getFactoryId());
         qrBoxCodeFormat.setName(req.getName());
         qrBoxCodeFormat.setColorPerRollScalar(req.getColorPerRollScalar());
         qrBoxCodeFormat.setFormatNumber(req.getFormatNumber());
@@ -114,8 +114,8 @@ public class QrBoxCodeFormatImpl implements QrBoxCodeFormatService {
     @Override
     public ListBoxCodeFormatRes listBoxCodeFormat(ListBoxCodeFormatReq req) {
         //数据权限隔离，如果登录账号是包材厂，只能看账号包材厂的数据。否则看全部
-        if (userUtil.getUser().getFactoryId() != null) {
-            req.setFactoryId(userUtil.getUser().getFactoryId());
+        if (userUtil.getWholeUser().getFactoryId() != null) {
+            req.setFactoryId(userUtil.getWholeUser().getFactoryId());
         }
         //分页查询
         IPage<QrBoxCodeFormatVO> iPage = qrBoxCodeFormatMapper.listBoxCodeFormat(PageUtil.createPage(req), req);

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

@@ -164,7 +164,7 @@ public class QrPackageServiceImpl implements QrPackageService {
         // copy属性值
         qrPackage = PojoConverterUtils.copy(req, QrPackage.class);
         //若当前登录用户为包材厂用户，则该选项默认选择该用户所在的包材厂，不可修改
-        qrPackage.setFactoryCoverId(userUtil.getUser().getFactoryId() != null ? userUtil.getUser().getFactoryId() : req.getFactoryCoverId());
+        qrPackage.setFactoryCoverId(userUtil.getWholeUser().getFactoryId() != null ? userUtil.getWholeUser().getFactoryId() : req.getFactoryCoverId());
         // 新增or修改
         Long userId = userUtil.getUser().getId();
         qrPackage.setUpdateBy(userId);
@@ -248,8 +248,8 @@ public class QrPackageServiceImpl implements QrPackageService {
     @Override
     public ListQrPackageRes listQrPackage(ListQrPackageReq req) {
         //数据权限隔离，如果登录账号是包材厂，只能看账号包材厂的数据。否则看全部
-        if (userUtil.getUser().getFactoryId() != null) {
-            req.setFactoryCoverId(userUtil.getUser().getFactoryId());
+        if (userUtil.getWholeUser().getFactoryId() != null) {
+            req.setFactoryCoverId(userUtil.getWholeUser().getFactoryId());
         }
 
         // 分页查询