From 5f98db35197802f2ed4179dd957be4230a2377f7 Mon Sep 17 00:00:00 2001
From: "zangch@mesnac.com" <zangch@mesnac.com>
Date: Mon, 24 Nov 2025 10:49:12 +0800
Subject: [PATCH] =?UTF-8?q?feat(crm):=20=E6=B7=BB=E5=8A=A0=E6=8A=A5?=
 =?UTF-8?q?=E4=BB=B7=E5=8D=95=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90=E6=B3=A8?=
 =?UTF-8?q?=E8=A7=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 CrmQuoteInfoMapper 接口的多个查询方法上添加@DataPermission注解
- 使用@DataColumn注解绑定部门和用户字段权限("deptName"对应"t.create_dept"，"userName"对应"t.create_by")
- 修改 CrmQuoteInfoServiceImpl 中查询列表方法，调用带数据权限的方法selectCustomCrmQuoteInfoVoList
- 实现对报价单相关查询的部门及用户级别数据权限控制
---
 .../oa/crm/mapper/CrmQuoteInfoMapper.java     | 22 +++++++++++++++++++
 .../service/impl/CrmQuoteInfoServiceImpl.java |  5 ++---
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/mapper/CrmQuoteInfoMapper.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/mapper/CrmQuoteInfoMapper.java
index f5d9ac4d..3a772e60 100644
--- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/mapper/CrmQuoteInfoMapper.java
+++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/mapper/CrmQuoteInfoMapper.java
@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import org.apache.ibatis.annotations.Param;
+import org.dromara.common.mybatis.annotation.DataColumn;
+import org.dromara.common.mybatis.annotation.DataPermission;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 import org.dromara.oa.crm.domain.CrmQuoteInfo;
 import org.dromara.oa.crm.domain.vo.CrmQuoteInfoVo;
@@ -27,6 +29,10 @@ public interface CrmQuoteInfoMapper extends BaseMapperPlus<CrmQuoteInfo, CrmQuot
      * @param queryWrapper 条件
      * @return 报价单信息集合
      */
+    @DataPermission({
+        @DataColumn(key = "deptName", value = "t.create_dept"),
+        @DataColumn(key = "userName", value = "t.create_by")
+    })
     public Page<CrmQuoteInfoVo> selectCustomCrmQuoteInfoVoList(@Param("page") Page<CrmQuoteInfoVo> page, @Param(Constants.WRAPPER) MPJLambdaWrapper<CrmQuoteInfo> queryWrapper);
 
     /**
@@ -35,6 +41,10 @@ public interface CrmQuoteInfoMapper extends BaseMapperPlus<CrmQuoteInfo, CrmQuot
      * @param queryWrapper 条件
      * @return 报价单信息集合
      */
+    @DataPermission({
+        @DataColumn(key = "deptName", value = "t.create_dept"),
+        @DataColumn(key = "userName", value = "t.create_by")
+    })
     public List<CrmQuoteInfoVo> selectCustomCrmQuoteInfoVoList(@Param(Constants.WRAPPER) MPJLambdaWrapper<CrmQuoteInfo> queryWrapper);
 
     /**
@@ -59,6 +69,10 @@ public interface CrmQuoteInfoMapper extends BaseMapperPlus<CrmQuoteInfo, CrmQuot
      * @param queryWrapper 查询条件
      * @return 记录总数
      */
+    @DataPermission({
+        @DataColumn(key = "deptName", value = "t.create_dept"),
+        @DataColumn(key = "userName", value = "t.create_by")
+    })
     Long countCustomCrmQuoteInfo(@Param(Constants.WRAPPER) Wrapper<CrmQuoteInfo> queryWrapper);
 
     /**
@@ -68,6 +82,10 @@ public interface CrmQuoteInfoMapper extends BaseMapperPlus<CrmQuoteInfo, CrmQuot
      * @param queryWrapper 查询条件
      * @return 分页结果
      */
+    @DataPermission({
+        @DataColumn(key = "deptName", value = "t.create_dept"),
+        @DataColumn(key = "userName", value = "t.create_by")
+    })
     Page<CrmQuoteInfoVo> selectCustomCrmQuoteInfoVoPage(@Param("page") Page<CrmQuoteInfoVo> page, @Param(Constants.WRAPPER) Wrapper<CrmQuoteInfo> queryWrapper);
 
     /**
@@ -108,6 +126,10 @@ public interface CrmQuoteInfoMapper extends BaseMapperPlus<CrmQuoteInfo, CrmQuot
      * @param queryWrapper 查询条件
      * @return 是否存在
      */
+    @DataPermission({
+        @DataColumn(key = "deptName", value = "t.create_dept"),
+        @DataColumn(key = "userName", value = "t.create_by")
+    })
     Boolean existsCrmQuoteInfo(@Param(Constants.WRAPPER) Wrapper<CrmQuoteInfo> queryWrapper);
 
 
diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/impl/CrmQuoteInfoServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/impl/CrmQuoteInfoServiceImpl.java
index edf01aea..70e7026f 100644
--- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/impl/CrmQuoteInfoServiceImpl.java
+++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/impl/CrmQuoteInfoServiceImpl.java
@@ -12,7 +12,6 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.oa.crm.domain.*;
 import org.dromara.oa.crm.domain.bo.CrmQuoteInfoBo;
 import org.dromara.oa.crm.domain.bo.CrmQuoteMaterialBo;
-import org.dromara.oa.crm.domain.bo.CrmSupplierInfoBo;
 import org.dromara.oa.crm.domain.vo.CrmCustomerContactVo;
 import org.dromara.oa.crm.domain.vo.CrmQuoteInfoVo;
 import org.dromara.oa.crm.domain.vo.CrmQuoteMaterialVo;
@@ -23,9 +22,9 @@ import org.dromara.oa.crm.service.ICrmQuoteInfoService;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.*;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -88,7 +87,7 @@ public class CrmQuoteInfoServiceImpl implements ICrmQuoteInfoService {
     @Override
     public List<CrmQuoteInfoVo> queryList(CrmQuoteInfoBo bo) {
         MPJLambdaWrapper<CrmQuoteInfo> lqw = buildQueryWrapper(bo);
-        return baseMapper.selectVoList(lqw);
+        return baseMapper.selectCustomCrmQuoteInfoVoList(lqw);
     }
 
     private MPJLambdaWrapper<CrmQuoteInfo> buildQueryWrapper(CrmQuoteInfoBo bo) {