From 42d12a3fa39c9ade3d2c9f8a53ee388ed4dd3d51 Mon Sep 17 00:00:00 2001
From: caojia <1301869380@qq.com>
Date: Tue, 3 Nov 2026 14:19:20 +0800
Subject: [PATCH] =?UTF-8?q?:fire:=20=E7=A7=BB=E9=99=A4=E6=AF=9B=E5=88=A9?=
 =?UTF-8?q?=E5=88=86=E6=9E=90=E6=95=B0=E6=8D=AE=E8=8C=83=E5=9B=B4=E8=BF=87?=
 =?UTF-8?q?=E6=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/PrcProfitReportServiceImpl.java        |  4 ----
 .../mapper/price/PrcProfitReportMapper.xml      | 17 -----------------
 2 files changed, 21 deletions(-)

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<PrcProfitReportOrderRow> 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<PrcProfitReportProductRow> 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<PrcProfitReportSummary> 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)
                 </when>
             </choose>
-            <if test="params != null and params.dataScope != null and params.dataScope != ''">
-                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}
-                )
-            </if>
         </where>
     </sql>