Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro

yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/contact/CrmContactServiceImpl.java

@@ -159,10 +159,10 @@ public class CrmContactServiceImpl implements CrmContactService {
         // 2. 删除联系人
         contactMapper.deleteById(id);
 
-        // 4.1 删除数据权限
-        permissionService.deletePermission(CrmBizTypeEnum.CRM_CONTACT.getType(), id);
-        // 4.2 删除商机关联
+        // 4.1 删除商机关联
         contactBusinessService.deleteContactBusinessByContactId(id);
+        // 4.2 删除数据权限
+        permissionService.deletePermission(CrmBizTypeEnum.CRM_CONTACT.getType(), id);
 
         // 记录操作日志上下文
         LogRecordContext.putVariable("contactName", contact.getName());