From 11e9536bf17e452f947faf14bdce99b5f9d31094 Mon Sep 17 00:00:00 2001 From: xiaoyong931011 <15274802129@163.com> Date: Mon, 15 Mar 2021 21:38:07 +0800 Subject: [PATCH] 分销员后台0315 --- zq-erp/src/main/java/com/matrix/system/fenxiao/action/FenXiaoSettingAction.java | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/system/fenxiao/action/FenXiaoSettingAction.java b/zq-erp/src/main/java/com/matrix/system/fenxiao/action/FenXiaoSettingAction.java index 6060596..865f5da 100644 --- a/zq-erp/src/main/java/com/matrix/system/fenxiao/action/FenXiaoSettingAction.java +++ b/zq-erp/src/main/java/com/matrix/system/fenxiao/action/FenXiaoSettingAction.java @@ -1,5 +1,6 @@ package com.matrix.system.fenxiao.action; +import com.matrix.biz.dao.BizUserDao; import com.matrix.core.constance.MatrixConstance; import com.matrix.core.pojo.AjaxResult; import com.matrix.core.tools.WebUtil; @@ -41,6 +42,9 @@ @Autowired private ShoppingGoodsDao shoppingGoodsDao; + + @Autowired + private BizUserDao bizUserDao; /** *查询分销配置 @@ -79,6 +83,7 @@ result.putInMap("sqtj", sqtjRuleSettingsVo); if(CollUtil.isNotEmpty(sqtjRuleSettingsVo)){ for(FenXiaoSettingVo fenXiaoSettingVo : sqtjRuleSettingsVo) { + //选择申请条件条件3时,获得选中产品集合 if("3".equals(fenXiaoSettingVo.getParamValue())) { String paramValue1 = fenXiaoSettingVo.getParamValue1(); if(StrUtil.isNotEmpty(paramValue1)) { @@ -96,9 +101,6 @@ } } } - - - return result; } -- Gitblit v1.9.1