feat: add transfer permission

AgAngle · fit2-zhao · commit f6ce7f512a78 · 2025-12-04T09:53:46.000+08:00
diff --git a/backend/crm/src/main/java/cn/cordys/common/constants/PermissionConstants.java b/backend/crm/src/main/java/cn/cordys/common/constants/PermissionConstants.java
@@ -56,6 +56,7 @@ public class PermissionConstants {
     public static final String CUSTOMER_MANAGEMENT_READ = "CUSTOMER_MANAGEMENT:READ";
     public static final String CUSTOMER_MANAGEMENT_ADD = "CUSTOMER_MANAGEMENT:ADD";
     public static final String CUSTOMER_MANAGEMENT_UPDATE = "CUSTOMER_MANAGEMENT:UPDATE";
+    public static final String CUSTOMER_MANAGEMENT_TRANSFER = "CUSTOMER_MANAGEMENT:TRANSFER";
     public static final String CUSTOMER_MANAGEMENT_RECYCLE = "CUSTOMER_MANAGEMENT:RECYCLE";
     public static final String CUSTOMER_MANAGEMENT_DELETE = "CUSTOMER_MANAGEMENT:DELETE";
     public static final String CUSTOMER_MANAGEMENT_EXPORT = "CUSTOMER_MANAGEMENT:EXPORT";
@@ -95,6 +96,7 @@ public class PermissionConstants {
     public static final String OPPORTUNITY_MANAGEMENT_READ = "OPPORTUNITY_MANAGEMENT:READ";
     public static final String OPPORTUNITY_MANAGEMENT_ADD = "OPPORTUNITY_MANAGEMENT:ADD";
     public static final String OPPORTUNITY_MANAGEMENT_UPDATE = "OPPORTUNITY_MANAGEMENT:UPDATE";
+    public static final String OPPORTUNITY_MANAGEMENT_TRANSFER = "OPPORTUNITY_MANAGEMENT:TRANSFER";
     public static final String OPPORTUNITY_MANAGEMENT_DELETE = "OPPORTUNITY_MANAGEMENT:DELETE";
     public static final String OPPORTUNITY_MANAGEMENT_EXPORT = "OPPORTUNITY_MANAGEMENT:EXPORT";
     public static final String OPPORTUNITY_MANAGEMENT_RESIGN = "OPPORTUNITY_MANAGEMENT:RESIGN";
@@ -109,6 +111,7 @@ public class PermissionConstants {
     public static final String CLUE_MANAGEMENT_READ = "CLUE_MANAGEMENT:READ";
     public static final String CLUE_MANAGEMENT_ADD = "CLUE_MANAGEMENT:ADD";
     public static final String CLUE_MANAGEMENT_UPDATE = "CLUE_MANAGEMENT:UPDATE";
+    public static final String CLUE_MANAGEMENT_TRANSFER = "CLUE_MANAGEMENT:TRANSFER";
     public static final String CLUE_MANAGEMENT_RECYCLE = "CLUE_MANAGEMENT:RECYCLE";
     public static final String CLUE_MANAGEMENT_DELETE = "CLUE_MANAGEMENT:DELETE";
     public static final String CLUE_MANAGEMENT_EXPORT = "CLUE_MANAGEMENT:EXPORT";
diff --git a/backend/crm/src/main/java/cn/cordys/crm/clue/controller/ClueController.java b/backend/crm/src/main/java/cn/cordys/crm/clue/controller/ClueController.java
@@ -120,7 +120,7 @@ public void transitionCustomer(@Validated @RequestBody ClueTransitionCustomerReq
     }
 
     @PostMapping("/batch/transfer")
-    @RequiresPermissions(PermissionConstants.CLUE_MANAGEMENT_UPDATE)
+    @RequiresPermissions(PermissionConstants.CLUE_MANAGEMENT_TRANSFER)
     @Operation(summary = "批量转移线索")
     public void batchTransfer(@RequestBody ClueBatchTransferRequest request) {
         clueService.batchTransfer(request, SessionUtils.getUserId(), OrganizationContext.getOrganizationId());
diff --git a/backend/crm/src/main/java/cn/cordys/crm/customer/controller/CustomerController.java b/backend/crm/src/main/java/cn/cordys/crm/customer/controller/CustomerController.java
@@ -110,7 +110,7 @@ public void delete(@PathVariable String id) {
     }
 
     @PostMapping("/batch/transfer")
-    @RequiresPermissions(PermissionConstants.CUSTOMER_MANAGEMENT_UPDATE)
+    @RequiresPermissions(PermissionConstants.CUSTOMER_MANAGEMENT_TRANSFER)
     @Operation(summary = "批量转移客户")
     public void batchTransfer(@RequestBody CustomerBatchTransferRequest request) {
         customerService.batchTransfer(request, SessionUtils.getUserId(), OrganizationContext.getOrganizationId());
diff --git a/backend/crm/src/main/java/cn/cordys/crm/opportunity/controller/OpportunityController.java b/backend/crm/src/main/java/cn/cordys/crm/opportunity/controller/OpportunityController.java
@@ -107,7 +107,7 @@ public void deleteOpportunity(@PathVariable String id) {
 
 
     @PostMapping("/batch/transfer")
-    @RequiresPermissions(PermissionConstants.CUSTOMER_MANAGEMENT_UPDATE)
+    @RequiresPermissions(PermissionConstants.OPPORTUNITY_MANAGEMENT_TRANSFER)
     @Operation(summary = "批量转移商机")
     public void batchTransfer(@RequestBody OpportunityTransferRequest request) {
         opportunityService.transfer(request, SessionUtils.getUserId(), OrganizationContext.getOrganizationId());
diff --git a/backend/crm/src/main/resources/i18n/cordys-crm_en_US.properties b/backend/crm/src/main/resources/i18n/cordys-crm_en_US.properties
@@ -188,6 +188,7 @@ permission.add=Add
 permission.update=Edit
 permission.edit=Edit
 permission.delete=Delete
+permission.transfer=Transfer
 permission.import=Import
 permission.export=Export
 permission.recover=Recover
diff --git a/backend/crm/src/main/resources/i18n/cordys-crm_zh_CN.properties b/backend/crm/src/main/resources/i18n/cordys-crm_zh_CN.properties
@@ -188,6 +188,7 @@ permission.read=查看
 permission.add=添加
 permission.update=编辑
 permission.edit=编辑
+permission.transfer=转移
 permission.delete=删除
 permission.import=导入
 permission.export=导出
diff --git a/backend/crm/src/main/resources/migration/1.3.5/ddl/V1.3.5_1__init.sql b/backend/crm/src/main/resources/migration/1.3.5/ddl/V1.3.5_1__init.sql
@@ -0,0 +1 @@
+select database();
diff --git a/backend/crm/src/main/resources/migration/1.3.5/dml/V1.3.5_2_1__data.sql b/backend/crm/src/main/resources/migration/1.3.5/dml/V1.3.5_2_1__data.sql
@@ -0,0 +1,4 @@
+-- set innodb lock wait timeout
+SET SESSION innodb_lock_wait_timeout = 7200;
+
+SET SESSION innodb_lock_wait_timeout = DEFAULT;
diff --git a/backend/crm/src/main/resources/migration/1.3.5/dml/V1.3.5_2_2__permission.sql b/backend/crm/src/main/resources/migration/1.3.5/dml/V1.3.5_2_2__permission.sql
@@ -0,0 +1,16 @@
+-- set innodb lock wait timeout
+SET SESSION innodb_lock_wait_timeout = 7200;
+
+INSERT INTO sys_role_permission (id, role_id, permission_id) VALUES (UUID_SHORT(), 'org_admin', 'CUSTOMER_MANAGEMENT:TRANSFER');
+INSERT INTO sys_role_permission (id, role_id, permission_id) VALUES (UUID_SHORT(), 'org_admin', 'OPPORTUNITY_MANAGEMENT:TRANSFER');
+INSERT INTO sys_role_permission (id, role_id, permission_id) VALUES (UUID_SHORT(), 'org_admin', 'CLUE_MANAGEMENT:TRANSFER');
+
+INSERT INTO sys_role_permission (id, role_id, permission_id) VALUES (UUID_SHORT(), 'sales_manager', 'CUSTOMER_MANAGEMENT:TRANSFER');
+INSERT INTO sys_role_permission (id, role_id, permission_id) VALUES (UUID_SHORT(), 'sales_manager', 'OPPORTUNITY_MANAGEMENT:TRANSFER');
+INSERT INTO sys_role_permission (id, role_id, permission_id) VALUES (UUID_SHORT(), 'sales_manager', 'CLUE_MANAGEMENT:TRANSFER');
+
+INSERT INTO sys_role_permission (id, role_id, permission_id) VALUES (UUID_SHORT(), 'sales_staff', 'CUSTOMER_MANAGEMENT:TRANSFER');
+INSERT INTO sys_role_permission (id, role_id, permission_id) VALUES (UUID_SHORT(), 'sales_staff', 'OPPORTUNITY_MANAGEMENT:TRANSFER');
+INSERT INTO sys_role_permission (id, role_id, permission_id) VALUES (UUID_SHORT(), 'sales_staff', 'CLUE_MANAGEMENT:TRANSFER');
+
+SET SESSION innodb_lock_wait_timeout = DEFAULT;
diff --git a/backend/crm/src/main/resources/permission.json b/backend/crm/src/main/resources/permission.json
@@ -149,6 +149,9 @@
           {
             "id": "CUSTOMER_MANAGEMENT:UPDATE"
           },
+          {
+            "id": "CUSTOMER_MANAGEMENT:TRANSFER"
+          },
           {
             "id": "CUSTOMER_MANAGEMENT:RECYCLE",
             "name": "permission.customer_management.customer.recycle"
@@ -236,6 +239,9 @@
           {
             "id": "CLUE_MANAGEMENT:UPDATE"
           },
+          {
+            "id": "CLUE_MANAGEMENT:TRANSFER"
+          },
           {
             "id": "CLUE_MANAGEMENT:RECYCLE",
             "name": "permission.clue_management.clue.recycle"
@@ -296,6 +302,9 @@
           {
             "id": "OPPORTUNITY_MANAGEMENT:UPDATE"
           },
+          {
+            "id": "OPPORTUNITY_MANAGEMENT:TRANSFER"
+          },
           {
             "id": "OPPORTUNITY_MANAGEMENT:DELETE"
           },
diff --git a/backend/crm/src/test/java/cn/cordys/crm/clue/controller/ClueControllerTests.java b/backend/crm/src/test/java/cn/cordys/crm/clue/controller/ClueControllerTests.java
@@ -267,7 +267,7 @@ void testTransfer() throws Exception {
         Assertions.assertEquals(PERMISSION_USER_NAME, clue.getOwner());
 
         // 校验权限
-        requestPostPermissionTest(PermissionConstants.CLUE_MANAGEMENT_UPDATE, BATCH_TRANSFER, request);
+        requestPostPermissionTest(PermissionConstants.CLUE_MANAGEMENT_TRANSFER, BATCH_TRANSFER, request);
     }
 
     @Test
diff --git a/backend/crm/src/test/java/cn/cordys/crm/customer/controller/CustomerControllerTests.java b/backend/crm/src/test/java/cn/cordys/crm/customer/controller/CustomerControllerTests.java
@@ -343,7 +343,7 @@ void testTransfer() throws Exception {
         Assertions.assertEquals(PERMISSION_USER_NAME, customer.getOwner());
 
         // 校验权限
-        requestPostPermissionTest(PermissionConstants.CUSTOMER_MANAGEMENT_UPDATE, BATCH_TRANSFER, request);
+        requestPostPermissionTest(PermissionConstants.CUSTOMER_MANAGEMENT_TRANSFER, BATCH_TRANSFER, request);
     }
 
     @Test

Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ public void transitionCustomer(@Validated @RequestBody ClueTransitionCustomerReq`
`120`	`120`	`}`
`121`	`121`
`122`	`122`	`@PostMapping("/batch/transfer")`
`123`		`- @RequiresPermissions(PermissionConstants.CLUE_MANAGEMENT_UPDATE)`
	`123`	`+ @RequiresPermissions(PermissionConstants.CLUE_MANAGEMENT_TRANSFER)`
`124`	`124`	`@Operation(summary = "批量转移线索")`
`125`	`125`	`public void batchTransfer(@RequestBody ClueBatchTransferRequest request) {`
`126`	`126`	`clueService.batchTransfer(request, SessionUtils.getUserId(), OrganizationContext.getOrganizationId());`
Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ public void delete(@PathVariable String id) {`
`110`	`110`	`}`
`111`	`111`
`112`	`112`	`@PostMapping("/batch/transfer")`
`113`		`- @RequiresPermissions(PermissionConstants.CUSTOMER_MANAGEMENT_UPDATE)`
	`113`	`+ @RequiresPermissions(PermissionConstants.CUSTOMER_MANAGEMENT_TRANSFER)`
`114`	`114`	`@Operation(summary = "批量转移客户")`
`115`	`115`	`public void batchTransfer(@RequestBody CustomerBatchTransferRequest request) {`
`116`	`116`	`customerService.batchTransfer(request, SessionUtils.getUserId(), OrganizationContext.getOrganizationId());`
Original file line number	Diff line number	Diff line change
`@@ -149,6 +149,9 @@`
`149`	`149`	`{`
`150`	`150`	`"id": "CUSTOMER_MANAGEMENT:UPDATE"`
`151`	`151`	`},`
	`152`	`+ {`
	`153`	`+ "id": "CUSTOMER_MANAGEMENT:TRANSFER"`
	`154`	`+ },`
`152`	`155`	`{`
`153`	`156`	`"id": "CUSTOMER_MANAGEMENT:RECYCLE",`
`154`	`157`	`"name": "permission.customer_management.customer.recycle"`
`@@ -236,6 +239,9 @@`
`236`	`239`	`{`
`237`	`240`	`"id": "CLUE_MANAGEMENT:UPDATE"`
`238`	`241`	`},`
	`242`	`+ {`
	`243`	`+ "id": "CLUE_MANAGEMENT:TRANSFER"`
	`244`	`+ },`
`239`	`245`	`{`
`240`	`246`	`"id": "CLUE_MANAGEMENT:RECYCLE",`
`241`	`247`	`"name": "permission.clue_management.clue.recycle"`
`@@ -296,6 +302,9 @@`
`296`	`302`	`{`
`297`	`303`	`"id": "OPPORTUNITY_MANAGEMENT:UPDATE"`
`298`	`304`	`},`
	`305`	`+ {`
	`306`	`+ "id": "OPPORTUNITY_MANAGEMENT:TRANSFER"`
	`307`	`+ },`
`299`	`308`	`{`
`300`	`309`	`"id": "OPPORTUNITY_MANAGEMENT:DELETE"`
`301`	`310`	`},`