包材厂按权限查添加出参

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/controller/console/FactoryController.java

@@ -132,7 +132,6 @@ public class FactoryController {
         return BaseResponse.create(result);
     }
 
-
     @ApiOperation("包材厂下拉框")
     @GetMapping("listPageMaterials")
     public BaseResponse<ListPageMaterialsRes> listPageMaterials() {

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/res/ListPackageFactorySelectRes.java

@@ -25,6 +25,8 @@ public class ListPackageFactorySelectRes implements Serializable {
     @ApiModelProperty("账号类型(1:包材厂 2:非包材厂)")
     private Integer loginType;
 
+
+
     /**
      * 供应商bean
      */
@@ -43,5 +45,8 @@ public class ListPackageFactorySelectRes implements Serializable {
 
         @ApiModelProperty(value = "供应商名称")
         private String factoryName;
+
+        @ApiModelProperty(value = "供应商级别 1-一级供应商 2-二级供应商")
+        private Integer factoryLevel;
     }
 }

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

@@ -5,6 +5,7 @@ import com.abi.qms.platform.dao.entity.BaseFactory;
 import com.abi.qms.platform.dao.entity.QrBoxCodeFormat;
 import com.abi.qms.platform.dao.entity.QrPackage;
 import com.abi.qms.platform.dao.entity.UserInfo;
+import com.abi.qms.platform.dao.enums.FactoryLevelEnum;
 import com.abi.qms.platform.dao.enums.FactoryTypeEnum;
 import com.abi.qms.platform.dao.enums.LoginTypeEnum;
 import com.abi.qms.platform.dao.enums.ValidEnum;
@@ -298,22 +299,32 @@ public class FactoryServiceImpl implements FactoryService {
 
     @Override
     public ListPackageFactorySelectRes listPackageFactorySelect() {
-        ListPackageFactorySelectRes listPackageFactorySelectRes = new ListPackageFactorySelectRes();
+        Integer loginType;
+
+        //查询数据库
         QueryWrapper<BaseFactory> param = new QueryWrapper<>();
         //数据权限隔离，如果登录账号是包材厂，只能看账号包材厂的数据。否则看全部
         if (userUtil.getWholeUser().getFactoryId() != null && userUtil.getWholeUser().getFactoryType() != null && FactoryTypeEnum.COVER.is(userUtil.getWholeUser().getFactoryType()) ) {
             param.eq("id", userUtil.getWholeUser().getFactoryId());
-            listPackageFactorySelectRes.setLoginType(LoginTypeEnum.PACKAGE.getCode());
+            loginType = LoginTypeEnum.PACKAGE.getCode();
         } else {
-            listPackageFactorySelectRes.setLoginType(LoginTypeEnum.NOT_PACKAGE.getCode());
+            loginType = LoginTypeEnum.NOT_PACKAGE.getCode();
         }
+        //不查询二级供应商，因为下拉创建码包的时候不需要二级
+        param.ne("factory_level", FactoryLevelEnum.TWO.getCode());
+        //其他条件
         param.eq("factory_type", FactoryTypeEnum.COVER.getCode());
         param.eq("is_delete", 0);
         param.eq("valid", 1);
-        List<BaseFactory> baseDepartments = baseFactoryMapper.selectList(param);
-        List<ListPackageFactorySelectRes.FactoryBean> factoryBeans = PojoConverterUtils.copyList(baseDepartments, ListPackageFactorySelectRes.FactoryBean.class);
-        listPackageFactorySelectRes.setFactoryBeanList(factoryBeans);
-        return listPackageFactorySelectRes;
+        List<BaseFactory> factoryList = baseFactoryMapper.selectList(param);
+
+        //包装出参
+        ListPackageFactorySelectRes res = new ListPackageFactorySelectRes();
+        List<ListPackageFactorySelectRes.FactoryBean> factoryBeans = PojoConverterUtils.copyList(factoryList, ListPackageFactorySelectRes.FactoryBean.class);
+        res.setFactoryBeanList(factoryBeans);
+        res.setLoginType(loginType);
+
+        return res;
     }
 
     @Override