crm：code review 数据权限的实现

YunaiV
1 parent 899e40de
Showing 4 changed files with 3 additions and 91 deletions
sql/mysql/crm_menu.sql
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/CrmCustomerController.java
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/dataobject/permission/CrmPermissionDO.java
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/customer/CrmCustomerMapper.java
--- ----------------------------
--- 客户公海配置
--- ----------------------------
--- 菜单 SQL
-INSERT INTO system_menu(
-    name, permission, type, sort, parent_id,
-    path, icon, component, status, component_name
-)
-VALUES (
-   '客户公海配置', '', 2, 0, 2397,
-   'customer-pool-config', 'ep:data-analysis', 'crm/customerPoolConf/index', 0, 'CustomerPoolConf'
-);
-
--- 按钮父菜单ID
--- 暂时只支持 MySQL。如果你是 Oracle、PostgreSQL、SQLServer 的话，需要手动修改 @parentId 的部分的代码
-SELECT @parentId := LAST_INSERT_ID();
-
--- 按钮 SQL
-INSERT INTO system_menu(
-    name, permission, type, sort, parent_id,
-    path, icon, component, status
-)
-VALUES (
-   '客户公海配置保存', 'crm:customer-pool-config:update', 3, 1, @parentId,
-   '', '', '', 0
-);
-
-
-
-
--- ----------------------------
--- 客户限制配置管理
--- ----------------------------
--- 菜单 SQL
-INSERT INTO system_menu(
-    name, permission, type, sort, parent_id,
-    path, icon, component, status, component_name
-)
-VALUES (
-   '客户限制配置管理', '', 2, 0, 2397,
-   'customer-limit-config', '', 'crm/customerLimitConfig/index', 0, 'CrmCustomerLimitConfig'
-);
-
--- 按钮父菜单ID
--- 暂时只支持 MySQL。如果你是 Oracle、PostgreSQL、SQLServer 的话，需要手动修改 @parentId 的部分的代码
-SELECT @parentId := LAST_INSERT_ID();
-
--- 按钮 SQL
-INSERT INTO system_menu(
-    name, permission, type, sort, parent_id,
-    path, icon, component, status
-)
-VALUES (
-   '客户限制配置查询', 'crm:customer-limit-config:query', 3, 1, @parentId,
-   '', '', '', 0
-);
-INSERT INTO system_menu(
-    name, permission, type, sort, parent_id,
-    path, icon, component, status
-)
-VALUES (
-   '客户限制配置创建', 'crm:customer-limit-config:create', 3, 2, @parentId,
-   '', '', '', 0
-);
-INSERT INTO system_menu(
-    name, permission, type, sort, parent_id,
-    path, icon, component, status
-)
-VALUES (
-   '客户限制配置更新', 'crm:customer-limit-config:update', 3, 3, @parentId,
-   '', '', '', 0
-);
-INSERT INTO system_menu(
-    name, permission, type, sort, parent_id,
-    path, icon, component, status
-)
-VALUES (
-   '客户限制配置删除', 'crm:customer-limit-config:delete', 3, 4, @parentId,
-   '', '', '', 0
-);
-INSERT INTO system_menu(
-    name, permission, type, sort, parent_id,
-    path, icon, component, status
-)
-VALUES (
-   '客户限制配置导出', 'crm:customer-limit-config:export', 3, 5, @parentId,
-   '', '', '', 0
-);
@@ -92,7 +92,7 @@ public class CrmCustomerController {
     }
     // TODO @puhui999：合并到 receiveCustomer
-    @PutMapping("/receive")
+    @PutMapping("/receive-")
     @Operation(summary = "领取客户公海数据")
     @Parameter(name = "id", description = "客户编号", required = true, example = "1024")
     @PreAuthorize("@ss.hasPermission('crm:customer:update')")
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.*;
 /**
- * Crm 数据权限 DO
+ * CRM 数据权限 DO
  *
  * @author HUIHUI
  */
@@ -61,7 +61,7 @@ public interface CrmCustomerMapper extends BaseMapperX&lt;CrmCustomerDO&gt; {
         //CrmPermissionUtils.builderRightJoinQuery(mpjLambdaWrapperX, CrmBizTypeEnum.CRM_CUSTOMER.getType(), userId);
         mpjLambdaWrapperX
                 //.rightJoin("(SELECT t1.biz_id FROM crm_permission t1 WHERE (t1.biz_type = 1 AND t1.user_id = 1)) t2 on t.id = t2.biz_id");
-                .rightJoin(CrmPermissionDO.class, CrmPermissionDO::getBizId, CrmCustomerDO::getId)
+                .rightJoin(CrmPermissionDO.class, CrmPermissionDO::getBizId, CrmCustomerDO::getId) // TODO @puhui999：应该是 inner join？
                 .eq(CrmPermissionDO::getBizType, CrmBizTypeEnum.CRM_CUSTOMER.getType())
                 .eq(CrmPermissionDO::getUserId, userId);
         /** TODO @芋艿：