diff --git a/bms-back/bms-system/src/main/java/com/bms/price/service/impl/PrcProfitReportServiceImpl.java b/bms-back/bms-system/src/main/java/com/bms/price/service/impl/PrcProfitReportServiceImpl.java index 2fb489a3..6e1b5cad 100644 --- a/bms-back/bms-system/src/main/java/com/bms/price/service/impl/PrcProfitReportServiceImpl.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/service/impl/PrcProfitReportServiceImpl.java @@ -7,7 +7,6 @@ import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; // 提成功能暂停使用:import org.springframework.transaction.annotation.Transactional; -import com.bms.common.annotation.DataScope; import com.bms.common.exception.ServiceException; import com.bms.common.utils.SecurityUtils; // 提成功能暂停使用:import com.bms.price.domain.PrcProfitCommissionRate; @@ -35,7 +34,6 @@ public class PrcProfitReportServiceImpl implements IPrcProfitReportService */ @Override - @DataScope(deptAlias = "su", deptField = "dept_id", userAlias = "su", userField = "user_id", permission = "report:profit:list") public List selectOrderRows(PrcProfitReportQuery query) { normalizeMultiValueFilters(query); @@ -43,7 +41,6 @@ public class PrcProfitReportServiceImpl implements IPrcProfitReportService } @Override - @DataScope(deptAlias = "su", deptField = "dept_id", userAlias = "su", userField = "user_id", permission = "report:profit:list") public List selectProductRows(PrcProfitReportQuery query) { normalizeMultiValueFilters(query); @@ -51,7 +48,6 @@ public class PrcProfitReportServiceImpl implements IPrcProfitReportService } @Override - @DataScope(deptAlias = "su", deptField = "dept_id", userAlias = "su", userField = "user_id", permission = "report:profit:list") public List selectSummary(PrcProfitReportQuery query) { normalizeMultiValueFilters(query); diff --git a/bms-back/bms-system/src/main/resources/mapper/price/PrcProfitReportMapper.xml b/bms-back/bms-system/src/main/resources/mapper/price/PrcProfitReportMapper.xml index 5904c397..6d363433 100644 --- a/bms-back/bms-system/src/main/resources/mapper/price/PrcProfitReportMapper.xml +++ b/bms-back/bms-system/src/main/resources/mapper/price/PrcProfitReportMapper.xml @@ -203,23 +203,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and (i.product_amount is null or i.redline_amount is null or i.sales_amount is null) - - and exists ( - select 1 - from sys_user su - where su.del_flag = '0' - and ( - (p.belong_saler_code is not null and p.belong_saler_code != '' - and (su.user_name = p.belong_saler_code collate utf8mb4_general_ci - or su.user_id = p.belong_saler_code + 0)) - or - (p.settlement_man_code is not null and p.settlement_man_code != '' - and (su.user_name = p.settlement_man_code collate utf8mb4_general_ci - or su.user_id = p.settlement_man_code + 0)) - ) - ${params.dataScope} - ) -