BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 91dd61edc0c7a8b9db590892e8ee60a06096f731

Authored by puhui999
1 parent a385a37c

完善 review 提到的问题

Inline Side-by-side
Showing 28 changed files with 164 additions and 106 deletions
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/CrmBusinessController.java
  View file @91dd61e
... ... @@ -91,9 +91,10 @@ public class CrmBusinessController {
91 91 @PutMapping("/transfer")
92 92 @Operation(summary = "商机转移")
93 93 @PreAuthorize("@ss.hasPermission('crm:business:update')")
94   - public CommonResult<Boolean> transfer(@Valid @RequestBody CrmTransferBusinessReqVO reqVO) {
  94 + public CommonResult<Boolean> transfer(@Valid @RequestBody CrmBusinessTransferReqVO reqVO) {
95 95 businessService.transferBusiness(reqVO, getLoginUserId());
96 96 return success(true);
97 97 }
98 98  
  99 +
99 100 }
... ...
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/vo/CrmTransferBusinessReqVO.java renamed to yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/vo/CrmBusinessTransferReqVO.java
  View file @91dd61e
... ... @@ -8,7 +8,7 @@ import javax.validation.constraints.NotNull;
8 8  
9 9 @Schema(description = "管理后台 - 商机转移 Request VO")
10 10 @Data
11   -public class CrmTransferBusinessReqVO {
  11 +public class CrmBusinessTransferReqVO {
12 12  
13 13 @Schema(description = "商机编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "10430")
14 14 @NotNull(message = "联系人编号不能为空")
... ... @@ -18,7 +18,7 @@ public class CrmTransferBusinessReqVO {
18 18 * 新负责人的用户编号
19 19 */
20 20 @NotNull(message = "新负责人的用户编号不能为空")
21   - @Schema(description = "商机编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "10430")
  21 + @Schema(description = "新负责人的用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "10430")
22 22 private Long newOwnerUserId;
23 23  
24 24 /**
... ...
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contact/ContactController.java
  View file @91dd61e
... ... @@ -100,7 +100,7 @@ public class ContactController {
100 100 @PutMapping("/transfer")
101 101 @Operation(summary = "联系人转移")
102 102 @PreAuthorize("@ss.hasPermission('crm:contact:update')")
103   - public CommonResult<Boolean> transfer(@Valid @RequestBody CrmTransferContactReqVO reqVO) {
  103 + public CommonResult<Boolean> transfer(@Valid @RequestBody CrmContactTransferReqVO reqVO) {
104 104 contactService.transferContact(reqVO, getLoginUserId());
105 105 return success(true);
106 106 }
... ...
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contact/vo/CrmContactTransferReqVO.java 0 → 100644
  View file @91dd61e
  1 +package cn.iocoder.yudao.module.crm.controller.admin.contact.vo;
  2 +
  3 +import cn.iocoder.yudao.module.crm.framework.enums.CrmPermissionLevelEnum;
  4 +import io.swagger.v3.oas.annotations.media.Schema;
  5 +import lombok.Data;
  6 +
  7 +import javax.validation.constraints.NotNull;
  8 +
  9 +@Schema(description = "管理后台 - CRM 联系人转移 Request VO")
  10 +@Data
  11 +public class CrmContactTransferReqVO {
  12 +
  13 + @Schema(description = "联系人编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "10430")
  14 + @NotNull(message = "联系人编号不能为空")
  15 + private Long id;
  16 +
  17 + /**
  18 + * 新负责人的用户编号
  19 + */
  20 + @NotNull(message = "新负责人的用户编号不能为空")
  21 + @Schema(description = "新负责人的用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "10430")
  22 + private Long newOwnerUserId;
  23 +
  24 + /**
  25 + * 老负责人是否加入团队，是/否
  26 + */
  27 + @Schema(description = "老负责人是否加入团队", requiredMode = Schema.RequiredMode.REQUIRED, example = "false")
  28 + @NotNull(message = "老负责人是否加入团队不能为空")
  29 + private Boolean joinTeam;
  30 +
  31 + /**
  32 + * 老负责人加入团队后的权限级别。如果 {@link #joinTeam} 为 false, permissionLevel 为 null
  33 + * 关联 {@link CrmPermissionLevelEnum}
  34 + */
  35 + @Schema(description = "老负责人加入团队后的权限级别", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
  36 + private Integer permissionLevel;
  37 +
  38 +}
... ...
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contact/vo/CrmTransferContactReqVO.java deleted
View file @a385a37
1   -package cn.iocoder.yudao.module.crm.controller.admin.contact.vo;
2   -
3   -import io.swagger.v3.oas.annotations.media.Schema;
4   -import lombok.Data;
5   -
6   -import javax.validation.constraints.NotNull;
7   -
8   -@Schema(description = "管理后台 - CRM 联系人转移 Request VO")
9   -@Data
10   -public class CrmTransferContactReqVO {
11   -
12   - @Schema(description = "联系人编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "10430")
13   - @NotNull(message = "联系人编号不能为空")
14   - private Long id;
15   -
16   - @Schema(description = "新负责人的用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "10430")
17   - @NotNull(message = "新负责人的用户编号不能为空")
18   - private Long ownerUserId;
19   -
20   - @Schema(description = "原负责人移除方式", requiredMode = Schema.RequiredMode.REQUIRED, example = "10430")
21   - @NotNull(message = "原负责人移除方式不能为空")
22   - private Integer transferType;
23   -
24   - @Schema(description = "权限类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "10430")
25   - @NotNull(message = "权限类型不能为空")
26   - private Integer permissionType;
27   -
28   -}
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/ContractController.java
  View file @91dd61e
... ... @@ -90,7 +90,7 @@ public class ContractController {
90 90 @PutMapping("/transfer")
91 91 @Operation(summary = "合同转移")
92 92 @PreAuthorize("@ss.hasPermission('crm:contract:update')")
93   - public CommonResult<Boolean> transfer(@Valid @RequestBody CrmTransferContractReqVO reqVO) {
  93 + public CommonResult<Boolean> transfer(@Valid @RequestBody CrmContractTransferReqVO reqVO) {
94 94 contractService.transferContract(reqVO, getLoginUserId());
95 95 return success(true);
96 96 }
... ...
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/vo/CrmContractTransferReqVO.java 0 → 100644
  View file @91dd61e
  1 +package cn.iocoder.yudao.module.crm.controller.admin.contract.vo;
  2 +
  3 +import cn.iocoder.yudao.module.crm.framework.enums.CrmPermissionLevelEnum;
  4 +import io.swagger.v3.oas.annotations.media.Schema;
  5 +import lombok.Data;
  6 +
  7 +import javax.validation.constraints.NotNull;
  8 +
  9 +@Schema(description = "管理后台 - CRM 合同转移 Request VO")
  10 +@Data
  11 +public class CrmContractTransferReqVO {
  12 +
  13 + @Schema(description = "合同编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "10430")
  14 + @NotNull(message = "联系人编号不能为空")
  15 + private Long id;
  16 +
  17 + /**
  18 + * 新负责人的用户编号
  19 + */
  20 + @NotNull(message = "新负责人的用户编号不能为空")
  21 + @Schema(description = "新负责人的用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "10430")
  22 + private Long newOwnerUserId;
  23 +
  24 + /**
  25 + * 老负责人是否加入团队，是/否
  26 + */
  27 + @Schema(description = "老负责人是否加入团队", requiredMode = Schema.RequiredMode.REQUIRED, example = "false")
  28 + @NotNull(message = "老负责人是否加入团队不能为空")
  29 + private Boolean joinTeam;
  30 +
  31 + /**
  32 + * 老负责人加入团队后的权限级别。如果 {@link #joinTeam} 为 false, permissionLevel 为 null
  33 + * 关联 {@link CrmPermissionLevelEnum}
  34 + */
  35 + @Schema(description = "老负责人加入团队后的权限级别", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
  36 + private Integer permissionLevel;
  37 +
  38 +}
... ...
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/vo/CrmTransferContractReqVO.java deleted
View file @a385a37
1   -package cn.iocoder.yudao.module.crm.controller.admin.contract.vo;
2   -
3   -import io.swagger.v3.oas.annotations.media.Schema;
4   -import lombok.Data;
5   -
6   -import javax.validation.constraints.NotNull;
7   -
8   -// TODO @puhui999：CrmContractTransferReqVO，模块名字要放前面；看看还有没其它类似的
9   -@Schema(description = "管理后台 - CRM 合同转移 Request VO")
10   -@Data
11   -public class CrmTransferContractReqVO {
12   -
13   - @Schema(description = "合同编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "10430")
14   - @NotNull(message = "合同编号不能为空")
15   - private Long id;
16   -
17   - @Schema(description = "新负责人的用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "10430")
18   - @NotNull(message = "新负责人的用户编号不能为空")
19   - private Long ownerUserId;
20   -
21   - @Schema(description = "原负责人移除方式", requiredMode = Schema.RequiredMode.REQUIRED, example = "10430")
22   - @NotNull(message = "原负责人移除方式不能为空")
23   - private Integer transferType;
24   -
25   - @Schema(description = "权限类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "10430")
26   - @NotNull(message = "权限类型不能为空")
27   - private Integer permissionType;
28   -
29   -}
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/CrmCustomerController.java
  View file @91dd61e
... ... @@ -90,7 +90,7 @@ public class CrmCustomerController {
90 90 @PutMapping("/transfer")
91 91 @Operation(summary = "客户转移")
92 92 @PreAuthorize("@ss.hasPermission('crm:customer:update')")
93   - public CommonResult<Boolean> transfer(@Valid @RequestBody CrmTransferCustomerReqVO reqVO) {
  93 + public CommonResult<Boolean> transfer(@Valid @RequestBody CrmCustomerTransferReqVO reqVO) {
94 94 customerService.transferCustomer(reqVO, getLoginUserId());
95 95 return success(true);
96 96 }
... ...
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/vo/CrmCustomerTransferReqVO.java 0 → 100644
  View file @91dd61e
  1 +package cn.iocoder.yudao.module.crm.controller.admin.customer.vo;
  2 +
  3 +import cn.iocoder.yudao.module.crm.framework.enums.CrmPermissionLevelEnum;
  4 +import io.swagger.v3.oas.annotations.media.Schema;
  5 +import lombok.Data;
  6 +
  7 +import javax.validation.constraints.NotNull;
  8 +
  9 +@Schema(description = "管理后台 - CRM 客户转移 Request VO")
  10 +@Data
  11 +public class CrmCustomerTransferReqVO {
  12 +
  13 + @Schema(description = "客户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "10430")
  14 + @NotNull(message = "联系人编号不能为空")
  15 + private Long id;
  16 +
  17 + /**
  18 + * 新负责人的用户编号
  19 + */
  20 + @NotNull(message = "新负责人的用户编号不能为空")
  21 + @Schema(description = "新负责人的用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "10430")
  22 + private Long newOwnerUserId;
  23 +
  24 + /**
  25 + * 老负责人是否加入团队，是/否
  26 + */
  27 + @Schema(description = "老负责人是否加入团队", requiredMode = Schema.RequiredMode.REQUIRED, example = "false")
  28 + @NotNull(message = "老负责人是否加入团队不能为空")
  29 + private Boolean joinTeam;
  30 +
  31 + /**
  32 + * 老负责人加入团队后的权限级别。如果 {@link #joinTeam} 为 false, permissionLevel 为 null
  33 + * 关联 {@link CrmPermissionLevelEnum}
  34 + */
  35 + @Schema(description = "老负责人加入团队后的权限级别", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
  36 + private Integer permissionLevel;
  37 +
  38 +}
... ...
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/vo/CrmTransferCustomerReqVO.java deleted
View file @a385a37
1   -package cn.iocoder.yudao.module.crm.controller.admin.customer.vo;
2   -
3   -import io.swagger.v3.oas.annotations.media.Schema;
4   -import lombok.Data;
5   -
6   -import javax.validation.constraints.NotNull;
7   -
8   -@Schema(description = "管理后台 - CRM 客户转移 Request VO")
9   -@Data
10   -public class CrmTransferCustomerReqVO {
11   -
12   - @Schema(description = "客户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "10430")
13   - @NotNull(message = "客户编号不能为空")
14   - private Long id;
15   -
16   - @Schema(description = "新负责人的用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "10430")
17   - @NotNull(message = "新负责人的用户编号不能为空")
18   - private Long ownerUserId;
19   -
20   - @Schema(description = "原负责人移除方式", requiredMode = Schema.RequiredMode.REQUIRED, example = "10430")
21   - @NotNull(message = "原负责人移除方式不能为空")
22   - private Integer transferType;
23   -
24   - @Schema(description = "权限类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "10430")
25   - @NotNull(message = "权限类型不能为空")
26   - private Integer permissionType;
27   -
28   -}
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/convert/business/CrmBusinessConvert.java
  View file @91dd61e
... ... @@ -35,6 +35,6 @@ public interface CrmBusinessConvert {
35 35 @Mapping(target = "bizId", source = "reqVO.id"),
36 36 @Mapping(target = "newOwnerUserId", source = "reqVO.id")
37 37 })
38   - CrmTransferPermissionReqBO convert(CrmTransferBusinessReqVO reqVO, Long userId);
  38 + CrmTransferPermissionReqBO convert(CrmBusinessTransferReqVO reqVO, Long userId);
39 39  
40 40 }
... ...
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/convert/contact/ContactConvert.java
  View file @91dd61e
... ... @@ -37,6 +37,6 @@ public interface ContactConvert {
37 37 @Mapping(target = "bizId", source = "reqVO.id"),
38 38 @Mapping(target = "newOwnerUserId", source = "reqVO.id")
39 39 })
40   - CrmTransferPermissionReqBO convert(CrmTransferContactReqVO reqVO, Long userId);
  40 + CrmTransferPermissionReqBO convert(CrmContactTransferReqVO reqVO, Long userId);
41 41  
42 42 }
... ...
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/convert/contract/ContractConvert.java
  View file @91dd61e
... ... @@ -37,6 +37,6 @@ public interface ContractConvert {
37 37 @Mapping(target = "bizId", source = "reqVO.id"),
38 38 @Mapping(target = "newOwnerUserId", source = "reqVO.id")
39 39 })
40   - CrmTransferPermissionReqBO convert(CrmTransferContractReqVO reqVO, Long userId);
  40 + CrmTransferPermissionReqBO convert(CrmContractTransferReqVO reqVO, Long userId);
41 41  
42 42 }
... ...
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/convert/customer/CrmCustomerConvert.java
  View file @91dd61e
... ... @@ -35,6 +35,6 @@ public interface CrmCustomerConvert {
35 35 @Mapping(target = "bizId", source = "reqVO.id"),
36 36 @Mapping(target = "newOwnerUserId", source = "reqVO.id")
37 37 })
38   - CrmTransferPermissionReqBO convert(CrmTransferCustomerReqVO reqVO, Long userId);
  38 + CrmTransferPermissionReqBO convert(CrmCustomerTransferReqVO reqVO, Long userId);
39 39  
40 40 }
... ...
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/dataobject/permission/CrmPermissionDO.java
  View file @91dd61e
... ... @@ -42,6 +42,8 @@ public class CrmPermissionDO extends BaseDO {
42 42 private Long userId;
43 43 /**
44 44 * 权限级别，关联 {@link CrmPermissionLevelEnum}
  45 + * 如果为公海数据的话会干掉此数据的负责人，领取人则上位负责人
  46 + * 例：客户放入公海后会干掉团队成员中的负责人，而其他团队成员则不受影响
45 47 */
46 48 private Integer permissionLevel;
47 49  
... ...
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/permission/CrmPermissionMapper.java
  View file @91dd61e
... ... @@ -44,4 +44,17 @@ public interface CrmPermissionMapper extends BaseMapperX&lt;CrmPermissionDO&gt; {
44 44 .eq(CrmPermissionDO::getBizId, bizId));
45 45 }
46 46  
  47 + /**
  48 + * 获取数据权限列表通过 数据类型 x 用户编号。如果
  49 + *
  50 + * @param bizType 数据类型，关联 {@link CrmBizTypeEnum}
  51 + * @param userId
  52 + * @return Crm 数据权限列表
  53 + */
  54 + default List<CrmPermissionDO> selectByBizTypeAndUserId(Integer bizType, Long userId) {
  55 + return selectList(new LambdaQueryWrapperX<CrmPermissionDO>()
  56 + .eq(CrmPermissionDO::getBizType, bizType)
  57 + .eq(CrmPermissionDO::getUserId, userId));
  58 + }
  59 +
47 60 }
... ...
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/framework/core/aop/CrmPermissionAspect.java
  View file @91dd61e
... ... @@ -80,8 +80,8 @@ public class CrmPermissionAspect {
80 80 return;
81 81 }
82 82 if (isRead(permissionLevel)) { // 读权限
83   - // 如果没有数据权限或没有负责人则表示此记录为公海数据所有人都有只读权限
84   - if (!CollUtil.anyMatch(bizPermissions, item -> isOwner(item.getPermissionLevel()))) {
  83 + // 如果没有数据权限或没有负责人则表示此记录为公海数据所有人都有只读权限可以领取成为负责人（团队成员领取的）
  84 + if (CollUtil.isEmpty(bizPermissions) || !CollUtil.anyMatch(bizPermissions, item -> isOwner(item.getPermissionLevel()))) {
85 85 return;
86 86 }
87 87 if (isRead(userPermission.getPermissionLevel())) { // 校验当前用户是否有读权限
... ...
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/business/CrmBusinessService.java
  View file @91dd61e
... ... @@ -76,6 +76,6 @@ public interface CrmBusinessService {
76 76 * @param reqVO 请求
77 77 * @param userId 用户编号
78 78 */
79   - void transferBusiness(CrmTransferBusinessReqVO reqVO, Long userId);
  79 + void transferBusiness(CrmBusinessTransferReqVO reqVO, Long userId);
80 80  
81 81 }
... ...
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/business/CrmBusinessServiceImpl.java
  View file @91dd61e
... ... @@ -109,7 +109,7 @@ public class CrmBusinessServiceImpl implements CrmBusinessService {
109 109  
110 110 @Override
111 111 @Transactional(rollbackFor = Exception.class)
112   - public void transferBusiness(CrmTransferBusinessReqVO reqVO, Long userId) {
  112 + public void transferBusiness(CrmBusinessTransferReqVO reqVO, Long userId) {
113 113 // 1 校验商机是否存在
114 114 validateBusinessExists(reqVO.getId());
115 115  
... ...
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contact/ContactService.java
  View file @91dd61e
... ... @@ -76,6 +76,6 @@ public interface ContactService {
76 76 * @param reqVO 请求
77 77 * @param userId 用户编号
78 78 */
79   - void transferContact(CrmTransferContactReqVO reqVO, Long userId);
  79 + void transferContact(CrmContactTransferReqVO reqVO, Long userId);
80 80  
81 81 }
... ...
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contact/ContactServiceImpl.java
  View file @91dd61e
... ... @@ -110,7 +110,7 @@ public class ContactServiceImpl implements ContactService {
110 110 }
111 111  
112 112 @Override
113   - public void transferContact(CrmTransferContactReqVO reqVO, Long userId) {
  113 + public void transferContact(CrmContactTransferReqVO reqVO, Long userId) {
114 114 // 1 校验联系人是否存在
115 115 validateContactExists(reqVO.getId());
116 116  
... ...
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contract/ContractService.java
  View file @91dd61e
... ... @@ -76,6 +76,6 @@ public interface ContractService {
76 76 * @param reqVO 请求
77 77 * @param userId 用户编号
78 78 */
79   - void transferContract(CrmTransferContractReqVO reqVO, Long userId);
  79 + void transferContract(CrmContractTransferReqVO reqVO, Long userId);
80 80  
81 81 }
... ...
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contract/ContractServiceImpl.java
  View file @91dd61e
... ... @@ -108,7 +108,7 @@ public class ContractServiceImpl implements ContractService {
108 108  
109 109 @Override
110 110 @Transactional(rollbackFor = Exception.class)
111   - public void transferContract(CrmTransferContractReqVO reqVO, Long userId) {
  111 + public void transferContract(CrmContractTransferReqVO reqVO, Long userId) {
112 112 // 1 校验合同是否存在
113 113 validateContractExists(reqVO.getId());
114 114  
... ...
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/customer/CrmCustomerService.java
  View file @91dd61e
... ... @@ -84,6 +84,6 @@ public interface CrmCustomerService {
84 84 * @param reqVO 请求
85 85 * @param userId 用户编号
86 86 */
87   - void transferCustomer(CrmTransferCustomerReqVO reqVO, Long userId);
  87 + void transferCustomer(CrmCustomerTransferReqVO reqVO, Long userId);
88 88  
89 89 }
... ...
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/customer/CrmCustomerServiceImpl.java
  View file @91dd61e
... ... @@ -131,7 +131,7 @@ public class CrmCustomerServiceImpl implements CrmCustomerService {
131 131  
132 132 @Override
133 133 @Transactional(rollbackFor = Exception.class)
134   - public void transferCustomer(CrmTransferCustomerReqVO reqVO, Long userId) {
  134 + public void transferCustomer(CrmCustomerTransferReqVO reqVO, Long userId) {
135 135 // 1. 校验合同是否存在
136 136 validateCustomer(reqVO.getId());
137 137  
... ...
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/permission/CrmPermissionService.java
  View file @91dd61e
... ... @@ -17,7 +17,6 @@ import java.util.List;
17 17 */
18 18 public interface CrmPermissionService {
19 19  
20   - // TODO @puhui999：方法名上，不用 Crm
21 20 /**
22 21 * 创建数据权限
23 22 *
... ... @@ -60,6 +59,15 @@ public interface CrmPermissionService {
60 59 List<CrmPermissionDO> getPermissionByBizTypeAndBizId(Integer bizType, Long bizId);
61 60  
62 61 /**
  62 + * 获取数据权限列表，通过 数据类型 x 用户编号
  63 + *
  64 + * @param bizType 数据类型，关联 {@link CrmBizTypeEnum}
  65 + * @param userId 用户编号
  66 + * @return Crm 数据权限列表
  67 + */
  68 + List<CrmPermissionDO> getPermissionByBizTypeAndUserId(Integer bizType, Long userId);
  69 +
  70 + /**
63 71 * 数据权限转移
64 72 *
65 73 * @param crmTransferPermissionReqBO 数据权限转移请求
... ...
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/permission/CrmPermissionServiceImpl.java
  View file @91dd61e
... ... @@ -73,6 +73,11 @@ public class CrmPermissionServiceImpl implements CrmPermissionService {
73 73 return crmPermissionMapper.selectByBizTypeAndBizId(bizType, bizId);
74 74 }
75 75  
  76 + @Override
  77 + public List<CrmPermissionDO> getPermissionByBizTypeAndUserId(Integer bizType, Long userId) {
  78 + return crmPermissionMapper.selectByBizTypeAndUserId(bizType, userId);
  79 + }
  80 +
76 81 private void validateCrmPermissionExists(Long id) {
77 82 if (crmPermissionMapper.selectById(id) == null) {
78 83 throw exception(CRM_PERMISSION_NOT_EXISTS);
... ...