diff --git a/BUILD.gn b/BUILD.gn
index 9a616e39f2d29d8759aafc1a4580cd6aae4f8c94..89619e71ac831d3acd22e890a35686b3fe3319d8 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright (c) 2021 Huawei Device Co., Ltd.
+# Copyright (c) 2021-2022 Huawei Device Co., Ltd.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
diff --git a/OAT.xml b/OAT.xml
index 850de47c26f0b487341562524fe7556774b3f0f8..792acf4d9d930dbbc4870b378fc0d65d265c5126 100644
--- a/OAT.xml
+++ b/OAT.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Copyright (c) 2021 Huawei Device Co., Ltd.
-
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
      You may obtain a copy of the License at
diff --git a/README.en.md b/README.en.md
deleted file mode 100644
index d8019605156ccc9d208d80ba490c29829e365840..0000000000000000000000000000000000000000
--- a/README.en.md
+++ /dev/null
@@ -1,44 +0,0 @@
-# applications_contactsdata<a name="ZH-CN_TOPIC_0000001122925147"></a>
-
--   [Introduction](#section1166054159366)
--   [Image architecture](#section1619419895966)
--   [Directory Structure](#section161941989596)
--   [Repositories Involved](#section1371113476307)
-
-## Introduction<a name="section1166054159366"></a>
-
-The contact database application is an indispensable management information application for every user to manage the contact database.
-Its content is very important for user managers, so the contact database should be able to provide sufficient information and quick 
-query means for each user's management, which greatly facilitates users to reasonably manage the contact database information.
-
-## Image architecture<a name="section1619419895966"></a>
-
-![](figures/Image_architecture.png)
-
-## Directory Structure<a name="section161941989596"></a>
-
-```
-/foundation/contactsdataability/
-├── ability
-│   ├── account                        #Account Management
-│   ├── checkpermission                #Permission Check
-│   ├── common                         #Public Method
-│   ├── datadisasterrecovery           #Data Corruption Recovery
-│   ├── merge                          #Contacts Merge
-│   └── sinicization                   #Chinese Characters to Pinyin Related
-├── contacts                            #NAPI
-├── dataBusiness
-│   ├── calllog                        #Call Records
-│   ├── contacts                       #Contacts Person
-│   ├── quicksearch                    #Quick Search
-│   └── voicemail                      #Voicemail
-├── test                               #Test Catalog
-├── BUILD.gn
-└── ohos.build
-```
-
-## Repositories Involved<a name="section1371113476307"></a>
-
-system applications
-
-applications_contactsdata
\ No newline at end of file
diff --git a/README.md b/README.md
index 41fb02ff90d78e504b9074a496f09cff66aae758..d8019605156ccc9d208d80ba490c29829e365840 100644
--- a/README.md
+++ b/README.md
@@ -1,521 +1,44 @@
-# 联系人数据库子系统
-# applications_contactsdata
+# applications_contactsdata<a name="ZH-CN_TOPIC_0000001122925147"></a>
 
--   [简介](#section1166054159366)
--   [架构图](#section1619419895966)
--   [目录](#section161941989596)
--   [相关仓](#section1371113476307)
+-   [Introduction](#section1166054159366)
+-   [Image architecture](#section1619419895966)
+-   [Directory Structure](#section161941989596)
+-   [Repositories Involved](#section1371113476307)
 
-## 简介<a name="section1166054159366"></a>
+## Introduction<a name="section1166054159366"></a>
 
-联系人数据库应用是每一个用户管理联系人数据库的不可缺少的一个管理信息应用，
-它的内容对于用户管理者来说是至关重要的，所以联系人数据库应该能够为每一个  
-用户的管理提供充足的信息和快捷查询手段，大大方便用户合理的管理联系人数据库信息。  
+The contact database application is an indispensable management information application for every user to manage the contact database.
+Its content is very important for user managers, so the contact database should be able to provide sufficient information and quick 
+query means for each user's management, which greatly facilitates users to reasonably manage the contact database information.
 
-## 架构图<a name="section1619419895966"></a>
+## Image architecture<a name="section1619419895966"></a>
 
 ![](figures/Image_architecture.png)
 
-## 目录<a name="section161941989596"></a>
+## Directory Structure<a name="section161941989596"></a>
 
 ```
 /foundation/contactsdataability/
 ├── ability
-│   ├── account                        #账户管理
-│   ├── checkpermission                #权限检测
-│   ├── common                         #公共方法:log,utils等
-│   ├── datadisasterrecovery           #数据损坏恢复
-│   ├── merge                          #联系人合并
-│   └── sinicization                   #汉字转拼音相关
+│   ├── account                        #Account Management
+│   ├── checkpermission                #Permission Check
+│   ├── common                         #Public Method
+│   ├── datadisasterrecovery           #Data Corruption Recovery
+│   ├── merge                          #Contacts Merge
+│   └── sinicization                   #Chinese Characters to Pinyin Related
 ├── contacts                            #NAPI
 ├── dataBusiness
-│   ├── calllog                        #通话记录
-│   ├── contacts                       #联系人
-│   ├── quicksearch                    #快速检索
-│   └── voicemail                      #语音信箱
-├── test                               #测试目录
+│   ├── calllog                        #Call Records
+│   ├── contacts                       #Contacts Person
+│   ├── quicksearch                    #Quick Search
+│   └── voicemail                      #Voicemail
+├── test                               #Test Catalog
 ├── BUILD.gn
 └── ohos.build
 ```
-## 使用说明
 
-### 概述
+## Repositories Involved<a name="section1371113476307"></a>
 
-提供联系人数据和通话记录以及语音信箱增、删、改、查、等接口。
-接口参数主要有string类型的uri和对象类型的value、DataAbilityPredicates
-
-使用功能接口前，需要导入相关模块。
-
-```js
-import featureAbility from '@ohos.ability.featureAbility';
-import ohos_data_ability from '@ohos.data.dataability';
-```
-### 通话记录
-
-#### DAHelper.insert(uri: string, value: ValuesBucket)
-
-- 接口说明
-
-  通话记录插入
-
-- insert参数描述
-
-  | 名称     | 读写属性 | 类型                   | 必填 | 描述                           |
-  | -------- | -------- | ---------------------- | ---- | ------------------------------ |
-  | uri      | 只读     | string                 | 是   | 具体操作的uri     |
-  | value    | 只读     | ValuesBucket           | 是   | 数据库字段key-value对象 |
-
-返回值为 通话记录id
-
-更新示例
-```js
-import featureAbility from '@ohos.ability.featureAbility';
-import ohos_data_ability from '@ohos.data.dataability';
-var  calllogDAhelperUri= "dataability:///com.ohos.calllogability";
-var calllogUri = "dataability:///com.ohos.calllogability/calls/calllog";
-var value = {"phone_number" : "xxxxx","display_name" : "xxx"};
-// 获取DAHelper
-var DAHelper = featureAbility.acquireDataAbilityHelper(calllogDAhelperUri);
-// 调用insert方法
-DAHelper.insert(calllogUri, value).then((data) => {
-	console.info("calllogId = " + data);
-});
-```
-#### DAHelper.update(uri: string, value: ValuesBucket, condition: DataAbilityPredicates)
-
-- 接口说明
-
-  通话记录修改
-
-- update参数描述
-
-  | 名称         | 读写属性 | 类型                    | 必填 | 描述                           |
-  | --------     | -------- | ---------------------- | ---- | ------------------------------ |
-  | uri          | 只读     | string                 | 是   | 具体操作的uri          |
-  | value        | 只读     | ValuesBucket           | 是   | 数据库字段key-value对象 |
-  | condition    | 只读     | DataAbilityPredicates  | 是   | 更新条件            |
-
-返回值为 成功为0否则为-1
-
-修改示例
-```js
-import featureAbility from '@ohos.ability.featureAbility';
-import ohos_data_ability from '@ohos.data.dataability';
-var  calllogDAhelperUri= "dataability:///com.ohos.calllogability";
-var calllogUri = "dataability:///com.ohos.calllogability/calls/calllog";
-var value = {"phone_number" : "xxxxx","display_name" : "xxx"};
-// 获取DAHelper
-var DAHelper = featureAbility.acquireDataAbilityHelper(calllogDAhelperUri);
-// 条件参数
-var condition = new ohos_data_ability.DataAbilityPredicates();
-condition.equalTo("id", "xxx");
-// 调用update方法
-DAHelper.update(calllogUri, value, condition).then((data) => {
-	console.info("resultCode = " + data);
-});
-```
-
-#### DAHelper.delete(uri: string, condition: DataAbilityPredicates)
-
-- 接口说明
-
-  通话记录删除
-
-- delete参数描述
-
-  | 名称         | 读写属性 | 类型                    | 必填 | 描述                           |
-  | --------     | -------- | ---------------------- | ---- | ------------------------------ |
-  | uri          | 只读     | string                 | 是   | 具体操作的uri          |
-  | condition    | 只读     | DataAbilityPredicates  | 是   | 删除条件            |
-
-返回值为 成功为0否则为-1
-
-删除示例
-```js
-import featureAbility from '@ohos.ability.featureAbility';
-import ohos_data_ability from '@ohos.data.dataability';
-var  calllogDAhelperUri= "dataability:///com.ohos.calllogability";
-var calllogUri = "dataability:///com.ohos.calllogability/calls/calllog";
-// 获取DAHelper
-var DAHelper = featureAbility.acquireDataAbilityHelper(calllogDAhelperUri);
-// 条件参数
-var condition = new ohos_data_ability.DataAbilityPredicates();
-condition.equalTo("id", "xxx");
-// 调用delete方法
-DAHelper.delete(calllogUri, condition).then((data) => {
-	console.info("deleteCode = " + data);
-});
-```
-
-#### DAHelper.query(uri: string, resultColumns: array, condition: DataAbilityPredicates)
-
-- 接口说明
-
-  通话记录查询
-
-- 查询参数描述
-
-  | 名称             | 读写属性 | 类型                    | 必填  | 描述                           |
-  | --------         | -------- | ---------------------- | ----  | ------------------------------ |
-  | uri              | 只读     | string                 | 是    | 具体操作的uri        |
-  | resultColumns    | 只读     | array                   | 是   | 需要查询的列字段名称   |
-  | condition        | 只读     | DataAbilityPredicates  | 是    | 查询条件            |
-
-返回值为 ResultSet 查询结果集
-
-查询示例
-```js
-import featureAbility from '@ohos.ability.featureAbility';
-import ohos_data_ability from '@ohos.data.dataability';
-var  calllogDAhelperUri= "dataability:///com.ohos.calllogability";
-var calllogUri = "dataability:///com.ohos.calllogability/calls/calllog";
-// 获取DAHelper
-var DAHelper = featureAbility.acquireDataAbilityHelper(calllogDAhelperUri);
-// 条件参数
-var condition = new ohos_data_ability.DataAbilityPredicates();
-condition.equalTo("id", "xxx");
-var resultColumns = [ "id", "display_name", "phone_number"];
-// 调用query方法
-DAHelper.query(calllogUri, resultColumns, condition).then((data) => {
-    if (resultSet.goToFirstRow()) {
-        do {
-            var displayName = resultSet.getString(resultSet.getColumnIndex("display_name"));
-            var id = resultSet.getInt(resultSet.getColumnIndex("id"));
-            var phoneNumber = resultSet.getString(resultSet.getColumnIndex("phone_number"));
-        } while (resultSet.goToNextRow());
-    }
-    resultSet.close();	
-});
-```
-返回值为 ResultSet 查询结果集
-
-### 语音信箱
-
-#### DAHelper.insert(uri: string, value: ValuesBucket)
-
-- 接口说明
-
-  语音信箱插入
-
-- insert参数描述
-
-  | 名称     | 读写属性 | 类型                   | 必填 | 描述                           |
-  | -------- | -------- | ---------------------- | ---- | ------------------------------ |
-  | uri      | 只读     | string                 | 是   | 具体操作的uri     |
-  | value    | 只读     | ValuesBucket           | 是   | 数据库字段key-value对象 |
-
-返回值为 语音信箱表id
-
-更新示例
-```js
-import featureAbility from '@ohos.ability.featureAbility';
-import ohos_data_ability from '@ohos.data.dataability';
-var  voicemailDAhelperUri= "dataability:///com.ohos.voicemailability";
-var voicemaiUri = "dataability:///com.ohos.voicemailability/calls/voicemail";
-var value = {"phone_number" : "xxxxx","display_name" : "xxx"};
-// 获取DAHelper
-var DAHelper = featureAbility.acquireDataAbilityHelper(voicemailDAhelperUri);
-// 调用insert方法
-DAHelper.insert(voicemaiUri, value).then((data) => {
-	console.info("calllogId = " + data);
-});
-```
-#### DAHelper.update(uri: string, value: ValuesBucket, condition:DataAbilityPredicates)
-
-- 接口说明
-
-  语音信箱修改
-
-- update参数描述
-
-  | 名称         | 读写属性 | 类型                    | 必填 | 描述                           |
-  | --------     | -------- | ---------------------- | ---- | ------------------------------ |
-  | uri          | 只读     | string                 | 是   | 具体操作的uri          |
-  | value        | 只读     | ValuesBucket           | 是   | 数据库字段key-value对象 |
-  | condition    | 只读     | DataAbilityPredicates  | 是   | 更新条件            |
-
-返回值为 成功为0否则为-1
-
-修改示例
-```js
-import featureAbility from '@ohos.ability.featureAbility';
-import ohos_data_ability from '@ohos.data.dataability';
-var  voicemailDAhelperUri= "dataability:///com.ohos.voicemailability";
-var voicemaiUri = "dataability:///com.ohos.voicemailability/calls/voicemail";
-var value = {"phone_number" : "xxxxx","display_name" : "xxx"};
-// 获取DAHelper
-var DAHelper = featureAbility.acquireDataAbilityHelper(voicemailDAhelperUri);
-// 条件参数
-var condition = new ohos_data_ability.DataAbilityPredicates();
-condition.equalTo("id", "xxx");
-// 调用update方法
-DAHelper.update(voicemaiUri, value, condition).then((data) => {
-	console.info("resultCode = " + data);
-});
-```
-
-#### DAHelper.delete(uri: string, condition: DataAbilityPredicates)
-
-- 接口说明
-
-  语音信箱删除
-
-- delete参数描述
-
-  | 名称         | 读写属性 | 类型                    | 必填 | 描述                           |
-  | --------     | -------- | ---------------------- | ---- | ------------------------------ |
-  | uri          | 只读     | string                 | 是   | 具体操作的uri          |
-  | condition    | 只读     | DataAbilityPredicates  | 是   | 删除条件            |
-
-返回值为 成功为0否则为-1
-
-删除示例
-```js
-import featureAbility from '@ohos.ability.featureAbility';
-import ohos_data_ability from '@ohos.data.dataability';
-var  voicemailDAhelperUri= "dataability:///com.ohos.voicemailability";
-var voicemaiUri = "dataability:///com.ohos.voicemailability/calls/voicemail";
-// 获取DAHelper
-var DAHelper = featureAbility.acquireDataAbilityHelper(voicemailDAhelperUri);
-// 条件参数
-var condition = new ohos_data_ability.DataAbilityPredicates();
-condition.equalTo("id", "xxx");
-// 调用delete方法
-DAHelper.delete(voicemaiUri, condition).then((data) => {
-	console.info("deleteCode = " + data);
-});
-```
-
-#### DAHelper.query(uri: string, resultColumns:array, condition: DataAbilityPredicates)
-
-- 接口说明
-
-  语音信箱查询
-
-- 查询参数描述
-
-  | 名称             | 读写属性 | 类型                    | 必填  | 描述                           |
-  | --------         | -------- | ---------------------- | ----  | ------------------------------ |
-  | uri              | 只读     | string                 | 是    | 具体操作的uri        |
-  | resultColumns    | 只读     | array                   | 是   | 需要查询的列字段名称   |
-  | condition        | 只读     | DataAbilityPredicates  | 是    | 查询条件            |
-
-返回值为 ResultSet 查询结果集
-
-查询示例
-```js
-import featureAbility from '@ohos.ability.featureAbility';
-import ohos_data_ability from '@ohos.data.dataability';
-var  voicemailDAhelperUri= "dataability:///com.ohos.voicemailability";
-var voicemaiUri = "dataability:///com.ohos.voicemailability/calls/voicemail";
-// 获取DAHelper
-var DAHelper = featureAbility.acquireDataAbilityHelper(calllogDAhelperUri);
-// 条件参数
-var condition = new ohos_data_ability.DataAbilityPredicates();
-condition.equalTo("id", "xxx");
-var resultColumns = [ "id", "display_name", "phone_number"];
-// 调用query方法
-DAHelper.query(voicemaiUri, resultColumns, condition).then((data) => {
-    if (resultSet.goToFirstRow()) {
-        do {
-            var displayName = resultSet.getString(resultSet.getColumnIndex("display_name"));
-            var id = resultSet.getInt(resultSet.getColumnIndex("id"));
-            var phoneNumber = resultSet.getString(resultSet.getColumnIndex("phone_number"));
-        } while (resultSet.goToNextRow());
-    }
-    resultSet.close();	
-});
-```
-
-### 联系人
-
-#### DAHelper.insert(uri: string, value: ValuesBucket)
-
-- 接口说明
-
-  联系人插入
-
-- insert参数描述
-
-  | 名称     | 读写属性 | 类型                   | 必填 | 描述                           |
-  | -------- | -------- | ---------------------- | ---- | ------------------------------ |
-  | uri      | 只读     | string                 | 是   | 具体操作的uri     |
-  | value    | 只读     | ValuesBucket           | 是   | 数据库字段key-value对象 |
-
-返回值为 联系人数据表id
-
-更新示例
-```js
-import featureAbility from '@ohos.ability.featureAbility';
-import ohos_data_ability from '@ohos.data.dataability';
-var  contactsUri= "dataability:///com.ohos.contactsdataability";
-var rawContactUri  = "dataability:///com.ohos.contactsdataability/contacts/raw_contact";
-var contactDataUri  = "dataability:///com.ohos.contactsdataability/contacts/contact_data";
-var value = {"display_name" : "xxx"};
-// 获取DAHelper
-var DAHelper = featureAbility.acquireDataAbilityHelper(contactsUri);
-// 调用insert方法
-DAHelper.insert(rawContactUri, value).then((rawContactId) => {
-	console.info("rawContactId = " + rawContactId);
-    // 联系人详细信息插入
-    var contactDataValues = {
-        "raw_contact_id" : rawContactId,
-        "content_type" : "name",
-        "detail_info" : "xxxxxxx"
-    };
-   DAHelper.insert(contactDataUri, contactDataValues).then((contactDataId) => {
-      console.info("rawContactId = " + contactDataId);
-   };
-});
-```
-#### DAHelper.update(uri: string, value: ValuesBucket, condition: DataAbilityPredicates)
-
-- 接口说明
-
-  联系人修改
-
-- update参数描述
-
-  | 名称         | 读写属性 | 类型                    | 必填 | 描述                           |
-  | --------     | -------- | ---------------------- | ---- | ------------------------------ |
-  | uri          | 只读     | string                 | 是   | 具体操作的uri          |
-  | value        | 只读     | ValuesBucket           | 是   | 数据库字段key-value对象 |
-  | condition    | 只读     | DataAbilityPredicates  | 是   | 更新条件            |
-
-返回值为 成功为0否则为-1
-
-修改示例
-```js
-import featureAbility from '@ohos.ability.featureAbility';
-import ohos_data_ability from '@ohos.data.dataability';
-var  contactsUri= "dataability:///com.ohos.contactsdataability";
-var rawContactUri  = "dataability:///com.ohos.contactsdataability/contacts/raw_contact";
-var contactDataUri  = "dataability:///com.ohos.contactsdataability/contacts/contact_data";
-var value = {"display_name" : "xxx"};
-// 获取DAHelper
-var DAHelper = featureAbility.acquireDataAbilityHelper(contactsUri);
-// 条件参数
-var condition = new ohos_data_ability.DataAbilityPredicates();
-condition.equalTo("id", "xxx");
-// 调用update方法
-DAHelper.update(rawContactUri, value, condition).then((data) => {
-	console.info("resultCode = " + data);
-});
-```
-
-#### DAHelper.delete(uri: string, condition: DataAbilityPredicates)
-
-- 接口说明
-
-  联系人删除
-
-- delete参数描述
-
-  | 名称         | 读写属性 | 类型                    | 必填 | 描述                           |
-  | --------     | -------- | ---------------------- | ---- | ------------------------------ |
-  | uri          | 只读     | string                 | 是   | 具体操作的uri          |
-  | condition    | 只读     | DataAbilityPredicates  | 是   | 删除条件            |
-
-返回值为 成功为0否则为-1
-
-删除示例
-```js
-import featureAbility from '@ohos.ability.featureAbility';
-import ohos_data_ability from '@ohos.data.dataability';
-var  contactsUri= "dataability:///com.ohos.contactsdataability";
-var rawContactUri  = "dataability:///com.ohos.contactsdataability/contacts/raw_contact";
-var contactDataUri  = "dataability:///com.ohos.contactsdataability/contacts/contact_data";
-// 获取DAHelper
-var DAHelper = featureAbility.acquireDataAbilityHelper(contactsUri);
-// 条件参数
-var condition = new ohos_data_ability.DataAbilityPredicates();
-condition.equalTo("id", "xxx");
-// 调用delete方法
-DAHelper.delete(contactDataUri, condition).then((data) => {
-	console.info("deleteCode = " + data);
-});
-```
-#### DAHelper.query(uri: string, resultColumns: array, condition: DataAbilityPredicates)
-
-- 接口说明
-
-  联系人查询
-
-- 查询参数描述
-
-  | 名称             | 读写属性 | 类型                    | 必填  | 描述                           |
-  | --------         | -------- | ---------------------- | ----  | ------------------------------ |
-  | uri              | 只读     | string                 | 是    | 具体操作的uri        |
-  | resultColumns    | 只读     | array                   | 是   | 需要查询的列字段名称   |
-  | condition        | 只读     | DataAbilityPredicates  | 是    | 查询条件            |
-
-返回值为 ResultSet 查询结果集
-
-查询示例
-```js
-import featureAbility from '@ohos.ability.featureAbility';
-import ohos_data_ability from '@ohos.data.dataability';
-var  contactsUri= "dataability:///com.ohos.contactsdataability";
-var rawContactUri  = "dataability:///com.ohos.contactsdataability/contacts/raw_contact";
-// 获取DAHelper
-var DAHelper = featureAbility.acquireDataAbilityHelper(contactsUri);
-// 条件参数
-var condition = new ohos_data_ability.DataAbilityPredicates();
-condition.equalTo("id", "xxx");
-var resultColumns = [ "id", "display_name"];
-// 调用query方法
-DAHelper.query(rawContactUri, resultColumns, condition).then((data) => {
-    if (resultSet.goToFirstRow()) {
-        do {
-            var displayName = resultSet.getString(resultSet.getColumnIndex("display_name"));
-        } while (resultSet.goToNextRow());
-    }
-    resultSet.close();	
-});
-```
-| 系统公共uri                                                                       |
-| ---------------------------------------------------------                        | 
-| dataability:///com.ohos.contactsdataability                                      | 
-| dataability:///com.ohos.contactsdataability/contacts/contact                     | 
-| dataability:///com.ohos.contactsdataability/contacts/raw_contact                 | 
-| dataability:///com.ohos.contactsdataability/contacts/contact_data                |
-| dataability:///com.ohos.contactsdataability/contacts/raw_contact/query_merge_list| 
-| dataability:///com.ohos.contactsdataability/contacts/raw_contact/split_contact   |
-| dataability:///com.ohos.contactsdataability/contacts/raw_contact/manual_merge    |
-| dataability:///com.ohos.contactsdataability/contacts/raw_contact/auto_merge      |
-| dataability:///com.ohos.contactsdataability/contacts/contact_type                |
-| dataability:///com.ohos.contactsdataability/contacts/groups                      |
-| dataability:///com.ohos.contactsdataability/contacts/photo_files                 |  
-| dataability:///com.ohos.contactsdataability/contacts/contact_blocklist           | 
-| dataability:///com.ohos.contactsdataability/contacts/deleted_raw_contact         | 
-| dataability:///com.ohos.contactsdataability/contacts/search_contact              | 
-| dataability:///com.ohos.contactsdataability/contacts/deleted_raw_contact         | 
-| dataability:///com.ohos.contactsdataability/contacts/deleted_raw_contact_record  |
-| dataability:///com.ohos.contactsdataability/contacts/backup                      |
-| dataability:///com.ohos.contactsdataability/contacts/recover                     |
-| dataability:///com.ohos.contactsdataability/profile/contact                      | 
-| dataability:///com.ohos.contactsdataability/profile/raw_contact                  | 
-| dataability:///com.ohos.contactsdataability/profile/contact_data                 |
-| dataability:///com.ohos.contactsdataability/profile/raw_contact/query_merge_list | 
-| dataability:///com.ohos.contactsdataability/profile/raw_contact/split_contact    |
-| dataability:///com.ohos.contactsdataability/profile/raw_contact/manual_merge     |
-| dataability:///com.ohos.contactsdataability/profile/raw_contact/auto_merge       |
-| dataability:///com.ohos.contactsdataability/profile/contact_type                 |
-| dataability:///com.ohos.contactsdataability/profile/groups                       |
-| dataability:///com.ohos.contactsdataability/profile/photo_files                  |  
-| dataability:///com.ohos.contactsdataability/profile/contact_blocklist            | 
-| dataability:///com.ohos.contactsdataability/profile/deleted_raw_contact          | 
-| dataability:///com.ohos.contactsdataability/profile/search_contact               | 
-| dataability:///com.ohos.contactsdataability/profile/deleted_raw_contact          | 
-| dataability:///com.ohos.contactsdataability/profile/deleted_raw_contact_record   |
-| dataability:///com.ohos.contactsdataability/profile/backup                       |
-| dataability:///com.ohos.contactsdataability/profile/recover                      |    
-| dataability:///com.ohos.calllogability                                           | 
-| dataability:///com.ohos.calllogability/calls/calllog                             |
-| dataability:///com.ohos.voicemailability                                         | 
-| dataability:///com.ohos.voicemailability/calls/voicemail                         | 
-## 相关仓<a name="section1371113476307"></a>
-
-系统应用
+system applications
 
 applications_contactsdata
\ No newline at end of file
diff --git a/README_zh.md b/README_zh.md
new file mode 100644
index 0000000000000000000000000000000000000000..41fb02ff90d78e504b9074a496f09cff66aae758
--- /dev/null
+++ b/README_zh.md
@@ -0,0 +1,521 @@
+# 联系人数据库子系统
+# applications_contactsdata
+
+-   [简介](#section1166054159366)
+-   [架构图](#section1619419895966)
+-   [目录](#section161941989596)
+-   [相关仓](#section1371113476307)
+
+## 简介<a name="section1166054159366"></a>
+
+联系人数据库应用是每一个用户管理联系人数据库的不可缺少的一个管理信息应用，
+它的内容对于用户管理者来说是至关重要的，所以联系人数据库应该能够为每一个  
+用户的管理提供充足的信息和快捷查询手段，大大方便用户合理的管理联系人数据库信息。  
+
+## 架构图<a name="section1619419895966"></a>
+
+![](figures/Image_architecture.png)
+
+## 目录<a name="section161941989596"></a>
+
+```
+/foundation/contactsdataability/
+├── ability
+│   ├── account                        #账户管理
+│   ├── checkpermission                #权限检测
+│   ├── common                         #公共方法:log,utils等
+│   ├── datadisasterrecovery           #数据损坏恢复
+│   ├── merge                          #联系人合并
+│   └── sinicization                   #汉字转拼音相关
+├── contacts                            #NAPI
+├── dataBusiness
+│   ├── calllog                        #通话记录
+│   ├── contacts                       #联系人
+│   ├── quicksearch                    #快速检索
+│   └── voicemail                      #语音信箱
+├── test                               #测试目录
+├── BUILD.gn
+└── ohos.build
+```
+## 使用说明
+
+### 概述
+
+提供联系人数据和通话记录以及语音信箱增、删、改、查、等接口。
+接口参数主要有string类型的uri和对象类型的value、DataAbilityPredicates
+
+使用功能接口前，需要导入相关模块。
+
+```js
+import featureAbility from '@ohos.ability.featureAbility';
+import ohos_data_ability from '@ohos.data.dataability';
+```
+### 通话记录
+
+#### DAHelper.insert(uri: string, value: ValuesBucket)
+
+- 接口说明
+
+  通话记录插入
+
+- insert参数描述
+
+  | 名称     | 读写属性 | 类型                   | 必填 | 描述                           |
+  | -------- | -------- | ---------------------- | ---- | ------------------------------ |
+  | uri      | 只读     | string                 | 是   | 具体操作的uri     |
+  | value    | 只读     | ValuesBucket           | 是   | 数据库字段key-value对象 |
+
+返回值为 通话记录id
+
+更新示例
+```js
+import featureAbility from '@ohos.ability.featureAbility';
+import ohos_data_ability from '@ohos.data.dataability';
+var  calllogDAhelperUri= "dataability:///com.ohos.calllogability";
+var calllogUri = "dataability:///com.ohos.calllogability/calls/calllog";
+var value = {"phone_number" : "xxxxx","display_name" : "xxx"};
+// 获取DAHelper
+var DAHelper = featureAbility.acquireDataAbilityHelper(calllogDAhelperUri);
+// 调用insert方法
+DAHelper.insert(calllogUri, value).then((data) => {
+	console.info("calllogId = " + data);
+});
+```
+#### DAHelper.update(uri: string, value: ValuesBucket, condition: DataAbilityPredicates)
+
+- 接口说明
+
+  通话记录修改
+
+- update参数描述
+
+  | 名称         | 读写属性 | 类型                    | 必填 | 描述                           |
+  | --------     | -------- | ---------------------- | ---- | ------------------------------ |
+  | uri          | 只读     | string                 | 是   | 具体操作的uri          |
+  | value        | 只读     | ValuesBucket           | 是   | 数据库字段key-value对象 |
+  | condition    | 只读     | DataAbilityPredicates  | 是   | 更新条件            |
+
+返回值为 成功为0否则为-1
+
+修改示例
+```js
+import featureAbility from '@ohos.ability.featureAbility';
+import ohos_data_ability from '@ohos.data.dataability';
+var  calllogDAhelperUri= "dataability:///com.ohos.calllogability";
+var calllogUri = "dataability:///com.ohos.calllogability/calls/calllog";
+var value = {"phone_number" : "xxxxx","display_name" : "xxx"};
+// 获取DAHelper
+var DAHelper = featureAbility.acquireDataAbilityHelper(calllogDAhelperUri);
+// 条件参数
+var condition = new ohos_data_ability.DataAbilityPredicates();
+condition.equalTo("id", "xxx");
+// 调用update方法
+DAHelper.update(calllogUri, value, condition).then((data) => {
+	console.info("resultCode = " + data);
+});
+```
+
+#### DAHelper.delete(uri: string, condition: DataAbilityPredicates)
+
+- 接口说明
+
+  通话记录删除
+
+- delete参数描述
+
+  | 名称         | 读写属性 | 类型                    | 必填 | 描述                           |
+  | --------     | -------- | ---------------------- | ---- | ------------------------------ |
+  | uri          | 只读     | string                 | 是   | 具体操作的uri          |
+  | condition    | 只读     | DataAbilityPredicates  | 是   | 删除条件            |
+
+返回值为 成功为0否则为-1
+
+删除示例
+```js
+import featureAbility from '@ohos.ability.featureAbility';
+import ohos_data_ability from '@ohos.data.dataability';
+var  calllogDAhelperUri= "dataability:///com.ohos.calllogability";
+var calllogUri = "dataability:///com.ohos.calllogability/calls/calllog";
+// 获取DAHelper
+var DAHelper = featureAbility.acquireDataAbilityHelper(calllogDAhelperUri);
+// 条件参数
+var condition = new ohos_data_ability.DataAbilityPredicates();
+condition.equalTo("id", "xxx");
+// 调用delete方法
+DAHelper.delete(calllogUri, condition).then((data) => {
+	console.info("deleteCode = " + data);
+});
+```
+
+#### DAHelper.query(uri: string, resultColumns: array, condition: DataAbilityPredicates)
+
+- 接口说明
+
+  通话记录查询
+
+- 查询参数描述
+
+  | 名称             | 读写属性 | 类型                    | 必填  | 描述                           |
+  | --------         | -------- | ---------------------- | ----  | ------------------------------ |
+  | uri              | 只读     | string                 | 是    | 具体操作的uri        |
+  | resultColumns    | 只读     | array                   | 是   | 需要查询的列字段名称   |
+  | condition        | 只读     | DataAbilityPredicates  | 是    | 查询条件            |
+
+返回值为 ResultSet 查询结果集
+
+查询示例
+```js
+import featureAbility from '@ohos.ability.featureAbility';
+import ohos_data_ability from '@ohos.data.dataability';
+var  calllogDAhelperUri= "dataability:///com.ohos.calllogability";
+var calllogUri = "dataability:///com.ohos.calllogability/calls/calllog";
+// 获取DAHelper
+var DAHelper = featureAbility.acquireDataAbilityHelper(calllogDAhelperUri);
+// 条件参数
+var condition = new ohos_data_ability.DataAbilityPredicates();
+condition.equalTo("id", "xxx");
+var resultColumns = [ "id", "display_name", "phone_number"];
+// 调用query方法
+DAHelper.query(calllogUri, resultColumns, condition).then((data) => {
+    if (resultSet.goToFirstRow()) {
+        do {
+            var displayName = resultSet.getString(resultSet.getColumnIndex("display_name"));
+            var id = resultSet.getInt(resultSet.getColumnIndex("id"));
+            var phoneNumber = resultSet.getString(resultSet.getColumnIndex("phone_number"));
+        } while (resultSet.goToNextRow());
+    }
+    resultSet.close();	
+});
+```
+返回值为 ResultSet 查询结果集
+
+### 语音信箱
+
+#### DAHelper.insert(uri: string, value: ValuesBucket)
+
+- 接口说明
+
+  语音信箱插入
+
+- insert参数描述
+
+  | 名称     | 读写属性 | 类型                   | 必填 | 描述                           |
+  | -------- | -------- | ---------------------- | ---- | ------------------------------ |
+  | uri      | 只读     | string                 | 是   | 具体操作的uri     |
+  | value    | 只读     | ValuesBucket           | 是   | 数据库字段key-value对象 |
+
+返回值为 语音信箱表id
+
+更新示例
+```js
+import featureAbility from '@ohos.ability.featureAbility';
+import ohos_data_ability from '@ohos.data.dataability';
+var  voicemailDAhelperUri= "dataability:///com.ohos.voicemailability";
+var voicemaiUri = "dataability:///com.ohos.voicemailability/calls/voicemail";
+var value = {"phone_number" : "xxxxx","display_name" : "xxx"};
+// 获取DAHelper
+var DAHelper = featureAbility.acquireDataAbilityHelper(voicemailDAhelperUri);
+// 调用insert方法
+DAHelper.insert(voicemaiUri, value).then((data) => {
+	console.info("calllogId = " + data);
+});
+```
+#### DAHelper.update(uri: string, value: ValuesBucket, condition:DataAbilityPredicates)
+
+- 接口说明
+
+  语音信箱修改
+
+- update参数描述
+
+  | 名称         | 读写属性 | 类型                    | 必填 | 描述                           |
+  | --------     | -------- | ---------------------- | ---- | ------------------------------ |
+  | uri          | 只读     | string                 | 是   | 具体操作的uri          |
+  | value        | 只读     | ValuesBucket           | 是   | 数据库字段key-value对象 |
+  | condition    | 只读     | DataAbilityPredicates  | 是   | 更新条件            |
+
+返回值为 成功为0否则为-1
+
+修改示例
+```js
+import featureAbility from '@ohos.ability.featureAbility';
+import ohos_data_ability from '@ohos.data.dataability';
+var  voicemailDAhelperUri= "dataability:///com.ohos.voicemailability";
+var voicemaiUri = "dataability:///com.ohos.voicemailability/calls/voicemail";
+var value = {"phone_number" : "xxxxx","display_name" : "xxx"};
+// 获取DAHelper
+var DAHelper = featureAbility.acquireDataAbilityHelper(voicemailDAhelperUri);
+// 条件参数
+var condition = new ohos_data_ability.DataAbilityPredicates();
+condition.equalTo("id", "xxx");
+// 调用update方法
+DAHelper.update(voicemaiUri, value, condition).then((data) => {
+	console.info("resultCode = " + data);
+});
+```
+
+#### DAHelper.delete(uri: string, condition: DataAbilityPredicates)
+
+- 接口说明
+
+  语音信箱删除
+
+- delete参数描述
+
+  | 名称         | 读写属性 | 类型                    | 必填 | 描述                           |
+  | --------     | -------- | ---------------------- | ---- | ------------------------------ |
+  | uri          | 只读     | string                 | 是   | 具体操作的uri          |
+  | condition    | 只读     | DataAbilityPredicates  | 是   | 删除条件            |
+
+返回值为 成功为0否则为-1
+
+删除示例
+```js
+import featureAbility from '@ohos.ability.featureAbility';
+import ohos_data_ability from '@ohos.data.dataability';
+var  voicemailDAhelperUri= "dataability:///com.ohos.voicemailability";
+var voicemaiUri = "dataability:///com.ohos.voicemailability/calls/voicemail";
+// 获取DAHelper
+var DAHelper = featureAbility.acquireDataAbilityHelper(voicemailDAhelperUri);
+// 条件参数
+var condition = new ohos_data_ability.DataAbilityPredicates();
+condition.equalTo("id", "xxx");
+// 调用delete方法
+DAHelper.delete(voicemaiUri, condition).then((data) => {
+	console.info("deleteCode = " + data);
+});
+```
+
+#### DAHelper.query(uri: string, resultColumns:array, condition: DataAbilityPredicates)
+
+- 接口说明
+
+  语音信箱查询
+
+- 查询参数描述
+
+  | 名称             | 读写属性 | 类型                    | 必填  | 描述                           |
+  | --------         | -------- | ---------------------- | ----  | ------------------------------ |
+  | uri              | 只读     | string                 | 是    | 具体操作的uri        |
+  | resultColumns    | 只读     | array                   | 是   | 需要查询的列字段名称   |
+  | condition        | 只读     | DataAbilityPredicates  | 是    | 查询条件            |
+
+返回值为 ResultSet 查询结果集
+
+查询示例
+```js
+import featureAbility from '@ohos.ability.featureAbility';
+import ohos_data_ability from '@ohos.data.dataability';
+var  voicemailDAhelperUri= "dataability:///com.ohos.voicemailability";
+var voicemaiUri = "dataability:///com.ohos.voicemailability/calls/voicemail";
+// 获取DAHelper
+var DAHelper = featureAbility.acquireDataAbilityHelper(calllogDAhelperUri);
+// 条件参数
+var condition = new ohos_data_ability.DataAbilityPredicates();
+condition.equalTo("id", "xxx");
+var resultColumns = [ "id", "display_name", "phone_number"];
+// 调用query方法
+DAHelper.query(voicemaiUri, resultColumns, condition).then((data) => {
+    if (resultSet.goToFirstRow()) {
+        do {
+            var displayName = resultSet.getString(resultSet.getColumnIndex("display_name"));
+            var id = resultSet.getInt(resultSet.getColumnIndex("id"));
+            var phoneNumber = resultSet.getString(resultSet.getColumnIndex("phone_number"));
+        } while (resultSet.goToNextRow());
+    }
+    resultSet.close();	
+});
+```
+
+### 联系人
+
+#### DAHelper.insert(uri: string, value: ValuesBucket)
+
+- 接口说明
+
+  联系人插入
+
+- insert参数描述
+
+  | 名称     | 读写属性 | 类型                   | 必填 | 描述                           |
+  | -------- | -------- | ---------------------- | ---- | ------------------------------ |
+  | uri      | 只读     | string                 | 是   | 具体操作的uri     |
+  | value    | 只读     | ValuesBucket           | 是   | 数据库字段key-value对象 |
+
+返回值为 联系人数据表id
+
+更新示例
+```js
+import featureAbility from '@ohos.ability.featureAbility';
+import ohos_data_ability from '@ohos.data.dataability';
+var  contactsUri= "dataability:///com.ohos.contactsdataability";
+var rawContactUri  = "dataability:///com.ohos.contactsdataability/contacts/raw_contact";
+var contactDataUri  = "dataability:///com.ohos.contactsdataability/contacts/contact_data";
+var value = {"display_name" : "xxx"};
+// 获取DAHelper
+var DAHelper = featureAbility.acquireDataAbilityHelper(contactsUri);
+// 调用insert方法
+DAHelper.insert(rawContactUri, value).then((rawContactId) => {
+	console.info("rawContactId = " + rawContactId);
+    // 联系人详细信息插入
+    var contactDataValues = {
+        "raw_contact_id" : rawContactId,
+        "content_type" : "name",
+        "detail_info" : "xxxxxxx"
+    };
+   DAHelper.insert(contactDataUri, contactDataValues).then((contactDataId) => {
+      console.info("rawContactId = " + contactDataId);
+   };
+});
+```
+#### DAHelper.update(uri: string, value: ValuesBucket, condition: DataAbilityPredicates)
+
+- 接口说明
+
+  联系人修改
+
+- update参数描述
+
+  | 名称         | 读写属性 | 类型                    | 必填 | 描述                           |
+  | --------     | -------- | ---------------------- | ---- | ------------------------------ |
+  | uri          | 只读     | string                 | 是   | 具体操作的uri          |
+  | value        | 只读     | ValuesBucket           | 是   | 数据库字段key-value对象 |
+  | condition    | 只读     | DataAbilityPredicates  | 是   | 更新条件            |
+
+返回值为 成功为0否则为-1
+
+修改示例
+```js
+import featureAbility from '@ohos.ability.featureAbility';
+import ohos_data_ability from '@ohos.data.dataability';
+var  contactsUri= "dataability:///com.ohos.contactsdataability";
+var rawContactUri  = "dataability:///com.ohos.contactsdataability/contacts/raw_contact";
+var contactDataUri  = "dataability:///com.ohos.contactsdataability/contacts/contact_data";
+var value = {"display_name" : "xxx"};
+// 获取DAHelper
+var DAHelper = featureAbility.acquireDataAbilityHelper(contactsUri);
+// 条件参数
+var condition = new ohos_data_ability.DataAbilityPredicates();
+condition.equalTo("id", "xxx");
+// 调用update方法
+DAHelper.update(rawContactUri, value, condition).then((data) => {
+	console.info("resultCode = " + data);
+});
+```
+
+#### DAHelper.delete(uri: string, condition: DataAbilityPredicates)
+
+- 接口说明
+
+  联系人删除
+
+- delete参数描述
+
+  | 名称         | 读写属性 | 类型                    | 必填 | 描述                           |
+  | --------     | -------- | ---------------------- | ---- | ------------------------------ |
+  | uri          | 只读     | string                 | 是   | 具体操作的uri          |
+  | condition    | 只读     | DataAbilityPredicates  | 是   | 删除条件            |
+
+返回值为 成功为0否则为-1
+
+删除示例
+```js
+import featureAbility from '@ohos.ability.featureAbility';
+import ohos_data_ability from '@ohos.data.dataability';
+var  contactsUri= "dataability:///com.ohos.contactsdataability";
+var rawContactUri  = "dataability:///com.ohos.contactsdataability/contacts/raw_contact";
+var contactDataUri  = "dataability:///com.ohos.contactsdataability/contacts/contact_data";
+// 获取DAHelper
+var DAHelper = featureAbility.acquireDataAbilityHelper(contactsUri);
+// 条件参数
+var condition = new ohos_data_ability.DataAbilityPredicates();
+condition.equalTo("id", "xxx");
+// 调用delete方法
+DAHelper.delete(contactDataUri, condition).then((data) => {
+	console.info("deleteCode = " + data);
+});
+```
+#### DAHelper.query(uri: string, resultColumns: array, condition: DataAbilityPredicates)
+
+- 接口说明
+
+  联系人查询
+
+- 查询参数描述
+
+  | 名称             | 读写属性 | 类型                    | 必填  | 描述                           |
+  | --------         | -------- | ---------------------- | ----  | ------------------------------ |
+  | uri              | 只读     | string                 | 是    | 具体操作的uri        |
+  | resultColumns    | 只读     | array                   | 是   | 需要查询的列字段名称   |
+  | condition        | 只读     | DataAbilityPredicates  | 是    | 查询条件            |
+
+返回值为 ResultSet 查询结果集
+
+查询示例
+```js
+import featureAbility from '@ohos.ability.featureAbility';
+import ohos_data_ability from '@ohos.data.dataability';
+var  contactsUri= "dataability:///com.ohos.contactsdataability";
+var rawContactUri  = "dataability:///com.ohos.contactsdataability/contacts/raw_contact";
+// 获取DAHelper
+var DAHelper = featureAbility.acquireDataAbilityHelper(contactsUri);
+// 条件参数
+var condition = new ohos_data_ability.DataAbilityPredicates();
+condition.equalTo("id", "xxx");
+var resultColumns = [ "id", "display_name"];
+// 调用query方法
+DAHelper.query(rawContactUri, resultColumns, condition).then((data) => {
+    if (resultSet.goToFirstRow()) {
+        do {
+            var displayName = resultSet.getString(resultSet.getColumnIndex("display_name"));
+        } while (resultSet.goToNextRow());
+    }
+    resultSet.close();	
+});
+```
+| 系统公共uri                                                                       |
+| ---------------------------------------------------------                        | 
+| dataability:///com.ohos.contactsdataability                                      | 
+| dataability:///com.ohos.contactsdataability/contacts/contact                     | 
+| dataability:///com.ohos.contactsdataability/contacts/raw_contact                 | 
+| dataability:///com.ohos.contactsdataability/contacts/contact_data                |
+| dataability:///com.ohos.contactsdataability/contacts/raw_contact/query_merge_list| 
+| dataability:///com.ohos.contactsdataability/contacts/raw_contact/split_contact   |
+| dataability:///com.ohos.contactsdataability/contacts/raw_contact/manual_merge    |
+| dataability:///com.ohos.contactsdataability/contacts/raw_contact/auto_merge      |
+| dataability:///com.ohos.contactsdataability/contacts/contact_type                |
+| dataability:///com.ohos.contactsdataability/contacts/groups                      |
+| dataability:///com.ohos.contactsdataability/contacts/photo_files                 |  
+| dataability:///com.ohos.contactsdataability/contacts/contact_blocklist           | 
+| dataability:///com.ohos.contactsdataability/contacts/deleted_raw_contact         | 
+| dataability:///com.ohos.contactsdataability/contacts/search_contact              | 
+| dataability:///com.ohos.contactsdataability/contacts/deleted_raw_contact         | 
+| dataability:///com.ohos.contactsdataability/contacts/deleted_raw_contact_record  |
+| dataability:///com.ohos.contactsdataability/contacts/backup                      |
+| dataability:///com.ohos.contactsdataability/contacts/recover                     |
+| dataability:///com.ohos.contactsdataability/profile/contact                      | 
+| dataability:///com.ohos.contactsdataability/profile/raw_contact                  | 
+| dataability:///com.ohos.contactsdataability/profile/contact_data                 |
+| dataability:///com.ohos.contactsdataability/profile/raw_contact/query_merge_list | 
+| dataability:///com.ohos.contactsdataability/profile/raw_contact/split_contact    |
+| dataability:///com.ohos.contactsdataability/profile/raw_contact/manual_merge     |
+| dataability:///com.ohos.contactsdataability/profile/raw_contact/auto_merge       |
+| dataability:///com.ohos.contactsdataability/profile/contact_type                 |
+| dataability:///com.ohos.contactsdataability/profile/groups                       |
+| dataability:///com.ohos.contactsdataability/profile/photo_files                  |  
+| dataability:///com.ohos.contactsdataability/profile/contact_blocklist            | 
+| dataability:///com.ohos.contactsdataability/profile/deleted_raw_contact          | 
+| dataability:///com.ohos.contactsdataability/profile/search_contact               | 
+| dataability:///com.ohos.contactsdataability/profile/deleted_raw_contact          | 
+| dataability:///com.ohos.contactsdataability/profile/deleted_raw_contact_record   |
+| dataability:///com.ohos.contactsdataability/profile/backup                       |
+| dataability:///com.ohos.contactsdataability/profile/recover                      |    
+| dataability:///com.ohos.calllogability                                           | 
+| dataability:///com.ohos.calllogability/calls/calllog                             |
+| dataability:///com.ohos.voicemailability                                         | 
+| dataability:///com.ohos.voicemailability/calls/voicemail                         | 
+## 相关仓<a name="section1371113476307"></a>
+
+系统应用
+
+applications_contactsdata
\ No newline at end of file
diff --git a/ability/account/src/account_change_event.cpp b/ability/account/src/account_change_event.cpp
index e8629ae2368d83743ffb69681bed9f11b3e76a24..86b151af555db0e121909b1921d1aa9cb426a18b 100644
--- a/ability/account/src/account_change_event.cpp
+++ b/ability/account/src/account_change_event.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2022 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ability/account/src/account_sync.cpp b/ability/account/src/account_sync.cpp
index ceaf24894e6cb241de947e37f6de0913534399b4..68051e27e0853251fd8511a529f1430d8732eb25 100644
--- a/ability/account/src/account_sync.cpp
+++ b/ability/account/src/account_sync.cpp
@@ -92,7 +92,9 @@ void AccountSync::SyncUpdateAccount(std::vector<OHOS::AccountSA::OhosAccountInfo
         HILOG_ERROR("SyncUpdateAccount isProfile values is %{public}d this database store ponit is null", isProfile);
         return;
     }
-    std::vector<AccountDataCollection> accounts = g_contactsAccount->GetAccountFromLoacl(store);
+    if (store != nullptr) {
+        std::vector<AccountDataCollection> accounts = g_contactsAccount->GetAccountFromLoacl(store);
+    }
     std::vector<AccountDataCollection> notInSysAccounts;
     for (size_t i = 0; i < accounts.size(); i++) {
         auto iter = accounts[i];
@@ -129,27 +131,29 @@ int AccountSync::ClearData(std::shared_ptr<OHOS::NativeRdb::RdbStore> store, int
 {
     RawContacts contactsRawContact;
     Contacts contactsContact;
-    if (accountId > ID_EMPTITY) {
-        int needDeleteRawContactId = contactsRawContact.GetDeleteRawContactIdByAccountId(store, accountId);
-        HILOG_INFO("GetDeleteRawContactIdByAccountId successfuly , needDeleteRawContactId is %{public}d",
-            needDeleteRawContactId);
-        int needDeleteContactId = contactsRawContact.GetDeleteContactIdByAccountId(store, accountId);
-        HILOG_INFO("GetDeleteContactIdByAccountId successfuly needDeleteContactId is %{public}d", needDeleteContactId);
-        g_contactsAccount->DeleteDataByRawId(store, needDeleteRawContactId);
-        int ret = store->Commit();
-        HILOG_INFO("DeleteDataByRawId successfuly commit ret %{public}d", ret);
-        contactsRawContact.DeleteRawcontactByRawId(store, needDeleteRawContactId);
-        ret = store->Commit();
-        HILOG_INFO("DeleteRawcontactByRawId successfuly commit ret %{public}d", ret);
-        contactsContact.DeleteContactById(store, needDeleteContactId);
-        ret = store->Commit();
-        HILOG_INFO("DeletecontactsById successfuly commit ret %{public}d", ret);
-        g_contactsAccount->DeleteGroupsByAccountId(store, accountId);
-        ret = store->Commit();
-        HILOG_INFO("DeleteGroupsByAccountId successfuly commit ret %{public}d", ret);
-        g_contactsAccount->DeleteAccountByAccountId(store, accountId);
-        ret = store->Commit();
-        HILOG_INFO("DeleteAccountByAccountId successfuly commit ret %{public}d", ret);
+    if (store != nullptr && account != nullptr) {
+        if (accountId > ID_EMPTITY) {
+            int needDeleteRawContactId = contactsRawContact.GetDeleteRawContactIdByAccountId(store, accountId);
+            HILOG_INFO("GetDeleteRawContactIdByAccountId successfuly , needDeleteRawContactId is %{public}d",
+                needDeleteRawContactId);
+            int needDeleteContactId = contactsRawContact.GetDeleteContactIdByAccountId(store, accountId);
+            HILOG_INFO("GetDeleteContactIdByAccountId successfuly needDeleteContactId is %{public}d", needDeleteContactId);
+            g_contactsAccount->DeleteDataByRawId(store, needDeleteRawContactId);
+            int ret = store->Commit();
+            HILOG_INFO("DeleteDataByRawId successfuly commit ret %{public}d", ret);
+            contactsRawContact.DeleteRawcontactByRawId(store, needDeleteRawContactId);
+            ret = store->Commit();
+            HILOG_INFO("DeleteRawcontactByRawId successfuly commit ret %{public}d", ret);
+            contactsContact.DeleteContactById(store, needDeleteContactId);
+            ret = store->Commit();
+            HILOG_INFO("DeletecontactsById successfuly commit ret %{public}d", ret);
+            g_contactsAccount->DeleteGroupsByAccountId(store, accountId);
+            ret = store->Commit();
+            HILOG_INFO("DeleteGroupsByAccountId successfuly commit ret %{public}d", ret);
+            g_contactsAccount->DeleteAccountByAccountId(store, accountId);
+            ret = store->Commit();
+            HILOG_INFO("DeleteAccountByAccountId successfuly commit ret %{public}d", ret);
+        }
     }
     return RDB_EXECUTE_OK;
 }
diff --git a/ability/common/utils/src/contacts_common_event.cpp b/ability/common/utils/src/contacts_common_event.cpp
index cc7b5dc0b3d9e97dd82a2fb1ab4bac785485d819..0a8aa824d7266d31a1e536745db8e2a5337390eb 100644
--- a/ability/common/utils/src/contacts_common_event.cpp
+++ b/ability/common/utils/src/contacts_common_event.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2022 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/contacts/src/contacts_api.cpp b/contacts/src/contacts_api.cpp
index 7fac544a1028d655dbe268c8b7c6a9cc8da00514..65f30b92fd090886e42dbfad71458f74a077d7d9 100644
--- a/contacts/src/contacts_api.cpp
+++ b/contacts/src/contacts_api.cpp
@@ -279,14 +279,16 @@ NativeRdb::DataAbilityPredicates BuildQureyContactPredicates(
 
 void HoldersStructure(std::map<std::string, std::string> &holders, Holder &holder)
 {
-    if (!holder.bundleName.empty()) {
-        holders["account_type"] = holder.bundleName;
-    }
-    if (!holder.displayName.empty()) {
-        holders["account_name"] = holder.displayName;
-    }
-    if (holder.holderId > 0) {
-        holders["account_id"] = std::to_string(holder.holderId);
+    if (holder != nullptr) {
+        if (!holder.bundleName.empty()) {
+            holders["account_type"] = holder.bundleName;
+        }
+        if (!holder.displayName.empty()) {
+            holders["account_name"] = holder.displayName;
+        }
+        if (holder.holderId > 0) {
+            holders["account_id"] = std::to_string(holder.holderId);
+        }
     }
 }
 
@@ -626,6 +628,7 @@ void ExecuteSyncDone(napi_env env, napi_status status, void *data)
         executeHelper->work = nullptr;
         executeHelper->deferred = nullptr;
         delete executeHelper;
+        executeHelper = nullptr;
     }
     HILOG_INFO("contactApi ExecuteSyncDone done===>");
 }
diff --git a/dataBusiness/contacts/src/contacts_database.cpp b/dataBusiness/contacts/src/contacts_database.cpp
index 74614b9f7cc1be9198ce6a8dac7ef59c8417510d..0c3e261d21d8f3cc99d5d33e38b82282fae6d235 100644
--- a/dataBusiness/contacts/src/contacts_database.cpp
+++ b/dataBusiness/contacts/src/contacts_database.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -635,7 +635,9 @@ void ContactsDataBase::DeletedAsyncTask(
     std::shared_ptr<OHOS::NativeRdb::RdbStore> &store, std::vector<OHOS::NativeRdb::ValuesBucket> &queryValuesBucket)
 {
     std::unique_ptr<AsyncItem> task = std::make_unique<AsyncDeleteContactsTask>(store_, queryValuesBucket);
-    g_asyncTaskQueue->Push(task);
+    if (task != nullptr) {
+        g_asyncTaskQueue->Push(task);
+    }
     g_asyncTaskQueue->Start();
 }
 
@@ -1260,7 +1262,9 @@ void ContactsDataBase::MergeUpdateTask(
     std::shared_ptr<OHOS::NativeRdb::RdbStore> &store, std::vector<int> &rawContactIdVector, bool isDeleted)
 {
     std::unique_ptr<AsyncItem> task = std::make_unique<AsyncTask>(store_, rawContactIdVector, isDeleted);
-    g_asyncTaskQueue->Push(task);
+    if (task != nullptr){
+        g_asyncTaskQueue->Push(task);
+    }
     g_asyncTaskQueue->Start();
 }
 
diff --git a/dataBusiness/voicemail/src/voicemail_database.cpp b/dataBusiness/voicemail/src/voicemail_database.cpp
index 369ef9992179f801efdaf0490a42676e14af809d..d32ab35356e4f68ec93bd0594655f910465fda5d 100644
--- a/dataBusiness/voicemail/src/voicemail_database.cpp
+++ b/dataBusiness/voicemail/src/voicemail_database.cpp
@@ -44,8 +44,10 @@ int64_t VoiceMailDataBase::InsertVoiceMail(std::string tableName, OHOS::NativeRd
         HILOG_ERROR("VoiceMailDataBase Insert store_ is nullptr");
         return RDB_OBJECT_EMPTY;
     }
-    CallLogDataBase::GetInstance()->QueryContactsByInsertCalls(insertValues);
-    int ret = store_->Insert(outRowId, tableName, insertValues);
+    if (insertValues != nullptr){
+        CallLogDataBase::GetInstance()->QueryContactsByInsertCalls(insertValues);
+        int ret = store_->Insert(outRowId, tableName, insertValues);
+    }
     if (ret != OHOS::NativeRdb::E_OK) {
         HILOG_ERROR("VoiceMailDataBase InsertVoiceMail ret :%{public}d", ret);
         return RDB_EXECUTE_FAIL;
@@ -61,8 +63,10 @@ int VoiceMailDataBase::UpdateVoiceMail(
         HILOG_ERROR("VoiceMailDataBase Update store_ is nullptr");
         return RDB_OBJECT_EMPTY;
     }
-    if (values.HasColumn(CallLogColumns::PHONE_NUMBER)) {
+    if (values != nullptr) {
+        if (values.HasColumn(CallLogColumns::PHONE_NUMBER)) {
         CallLogDataBase::GetInstance()->QueryContactsByInsertCalls(values);
+        }
     }
     int ret = store_->Update(changedRows, values, rdbPredicates);
     if (ret != OHOS::NativeRdb::E_OK) {
diff --git a/jstest/Calllog_test.js b/jstest/Calllog_test.js
index 05e30124b13a9ca8e160de40583b16ef993b6349..e6a43349c4c432c991141e7fcc0bbce9fc210de2 100644
--- a/jstest/Calllog_test.js
+++ b/jstest/Calllog_test.js
@@ -425,7 +425,7 @@ describe('CalllogTest', function() {
         var DAHelper = featureAbility.acquireDataAbilityHelper(URI_CALLLOG);
         console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper);
 
-        var insertValues = {"phone_number" : "196320147"};
+        var insertValues = {"phone_number" : "12345678901"};
         try {
             var calllogId = await DAHelper.insert(calllogUri, insertValues);
             console.info("logMessage calllog_fuzzyquery_test_100: calllogId = " + calllogId);
@@ -453,7 +453,7 @@ describe('CalllogTest', function() {
                         expect(resultSet.getString(0) == calllogId.toString()).assertTrue();
                         console.info(
                             'logMessage calllog_fuzzyquery_test_100: phone_number = ' + resultSet.getString(1));
-                        expect(resultSet.getString(1) == "196320147").assertTrue();
+                        expect(resultSet.getString(1) == "12345678901").assertTrue();
                     } while (resultSet.goToNextRow());
                 }
                 resultSet.close();
@@ -1067,7 +1067,7 @@ describe('CalllogTest', function() {
         console.info("--------logMessage abnormal_calllog_update_test_2300 is starting!------------");
         var DAHelper = featureAbility.acquireDataAbilityHelper(URI_CALLLOG);
         console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper);
-        var insertValues = {phone_number : "15748646546", display_name : "name2300"}
+        var insertValues = {phone_number : "12345678901", display_name : "name2300"}
         try {
             var calllogId = await DAHelper.insert(calllogUri, insertValues);
             var calllogIdTwo = await DAHelper.insert(calllogUri, insertValues);
@@ -1082,7 +1082,7 @@ describe('CalllogTest', function() {
         async function UpdateOneCalllog()
         {
             try {
-                var insertValues = {phone_number : "15748646546", display_names : "nameUpdateError2300"};
+                var insertValues = {phone_number : "12345678901", display_names : "nameUpdateError2300"};
                  var condition =
                     new ohos_data_ability.DataAbilityPredicates();
                 var updateCode = await DAHelper.update(calllogUri, insertValues, condition);
@@ -1112,7 +1112,7 @@ describe('CalllogTest', function() {
         console.info("--------logMessage abnormal_calllog_query_test_2400 is starting!------------");
         var DAHelper = featureAbility.acquireDataAbilityHelper(URI_CALLLOG);
         console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper);
-        var insertValues = {phone_number : "15748646546", display_name : "name2300"}
+        var insertValues = {phone_number : "12345678901", display_name : "name2300"}
         try {
             var calllogId = await DAHelper.insert(calllogUri, insertValues);
             var calllogIdTwo = await DAHelper.insert(calllogUri, insertValues);
@@ -1143,7 +1143,7 @@ describe('CalllogTest', function() {
         console.info("--------logMessage abnormal_calllog_query_test_2500 is starting!------------");
         var DAHelper = featureAbility.acquireDataAbilityHelper(URI_CALLLOG);
         console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper);
-        var insertValues = {phone_number : "15748646546", display_name : "name2300"}
+        var insertValues = {phone_number : "12345678901", display_name : "name2300"}
         try {
             var calllogId = await DAHelper.insert(calllogUri, insertValues);
             console.info('abnormal_calllog_query_test_2500 calllogId = ' + calllogId);
@@ -1175,7 +1175,7 @@ describe('CalllogTest', function() {
         console.info("--------logMessage abnormal_calllog_delete_test_2600 is starting!------------");
         var DAHelper = featureAbility.acquireDataAbilityHelper(URI_CALLLOG);
         console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper);
-        var insertValues = {phone_number : "15748646546", display_name : "name2300"}
+        var insertValues = {phone_number : "12345678901", display_name : "name2300"}
         try {
             var calllogId = await DAHelper.insert(calllogUri, insertValues);
             var calllogIdTwo = await DAHelper.insert(calllogUri, insertValues);
@@ -1210,7 +1210,7 @@ describe('CalllogTest', function() {
     it("abnormal_calllog_delete_test_2700", 0, async function(done) {
         var DAHelper = featureAbility.acquireDataAbilityHelper(URI_CALLLOG);
         console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper);
-        var insertValues = {phone_number : "270015748646546", display_name : "name2700"}
+        var insertValues = {phone_number : "270012345678901", display_name : "name2700"}
         try {
             var calllogId = await DAHelper.insert(calllogUri, insertValues);
             var calllogIdTwo = await DAHelper.insert(calllogUri, insertValues);
@@ -1225,7 +1225,7 @@ describe('CalllogTest', function() {
         async function UpdateOneCalllog()
         {
             try {
-                var insertValues = {phone_number : "270015748646546", display_names : "nameUpdateError2700"};
+                var insertValues = {phone_number : "270012345678901", display_names : "nameUpdateError2700"};
                 var condition = new ohos_data_ability.DataAbilityPredicates();
                 condition.equalTo("ids", calllogIdTwo.toString());
                 condition.or();
@@ -1256,7 +1256,7 @@ describe('CalllogTest', function() {
         console.info("------------abnormal_calllog_query_test_2800 is starting!-----------");
         var DAHelper = featureAbility.acquireDataAbilityHelper(URI_CALLLOG);
         console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper);
-        var insertValues = {"phone_number" : "196320147"};
+        var insertValues = {"phone_number" : "12345678901"};
         try {
             var calllogId = await DAHelper.insert(calllogUri, insertValues);
             console.info("logMessage abnormal_calllog_query_test_2800: calllogId = " + calllogId);
diff --git a/jstest/ContactCard_test.js b/jstest/ContactCard_test.js
index 455e00d59d8974a58737c3fb6d8f26a4960077c5..1528dc6a0c498c477fb276c74bcf6dd84ef2bd07 100644
--- a/jstest/ContactCard_test.js
+++ b/jstest/ContactCard_test.js
@@ -1548,7 +1548,7 @@ describe('ContactCardTest', function() {
 
     /**
      * @tc.number  contactCard_insert_test_2700
-     * @tc.name    Insert contact blacklist
+     * @tc.name    Insert contact blocklist
      * @tc.desc    Function test
      */
     it("contactCard_insert_test_2700", 0, async function(done) {
@@ -1573,7 +1573,7 @@ describe('ContactCardTest', function() {
 
     /**
      * @tc.number  contactCard_delete_test_2800
-     * @tc.name    Delete contact blacklist
+     * @tc.name    Delete contact blocklist
      * @tc.desc    Function test
      */
     it("contactCard_delete_test_2800", 0, async function(done) {
@@ -2712,7 +2712,7 @@ describe('ContactCardTest', function() {
 
     /**
      * @tc.number  contactCard_batchinsert_test_5400
-     * @tc.name    Batch operation of contact blacklist
+     * @tc.name    Batch operation of contact blocklist
      * @tc.desc    Function test
      */
     it("contactCard_batchinsert_test_5400", 0, async function(done) {
@@ -4748,7 +4748,7 @@ describe('ContactCardTest', function() {
 
     /**
      * @tc.number  contactCard_insertContactBlocklist_test_6800
-     * @tc.name    Add multiple records to the blacklist and verify whether the insertion is successful
+     * @tc.name    Add multiple records to the blocklist and verify whether the insertion is successful
      * @tc.desc    Function test
      */
     it("contactCard_insertContactBlocklist_test_6800", 0, async function(done) {
@@ -4794,7 +4794,7 @@ describe('ContactCardTest', function() {
 
     /**
      * @tc.number  contactCard_removeContactBlocklist_test_6900
-     * @tc.name    Delete multiple records from the blacklist and verify whether the deletion is successful
+     * @tc.name    Delete multiple records from the blocklist and verify whether the deletion is successful
      * @tc.desc    Function test
      */
     it("contactCard_removeContactBlocklist_test_6900", 0, async function(done) {
diff --git a/jstest/Contacts_test.js b/jstest/Contacts_test.js
index 42b59faa2cf87fa9e8ec1e642a308e02c5eeec25..ff23bfba4db9dd8dff98405e7e68ca7a8de0673e 100644
--- a/jstest/Contacts_test.js
+++ b/jstest/Contacts_test.js
@@ -1547,7 +1547,7 @@ describe('ContactsTest', function() {
 
     /**
      * @tc.number  contact_insert_test_2700
-     * @tc.name    Insert contact blacklist
+     * @tc.name    Insert contact blocklist
      * @tc.desc    Function test
      */
     it("contact_insert_test_2700", 0, async function(done) {
@@ -1572,7 +1572,7 @@ describe('ContactsTest', function() {
 
     /**
      * @tc.number  contact_delete_test_2800
-     * @tc.name    Delete contact blacklist
+     * @tc.name    Delete contact blocklist
      * @tc.desc    Function test
      */
     it("contact_delete_test_2800", 0, async function(done) {
@@ -2708,7 +2708,7 @@ describe('ContactsTest', function() {
 
     /**
      * @tc.number  contact_batchinsert_test_5400
-     * @tc.name    Batch operation of contact blacklist
+     * @tc.name    Batch operation of contact blocklist
      * @tc.desc    Function test
      */
     it("contact_batchinsert_test_5400", 0, async function(done) {
@@ -4728,7 +4728,7 @@ describe('ContactsTest', function() {
 
     /**
      * @tc.number  contact_insertContactBlocklist_test_6800
-     * @tc.name    Add multiple records to the blacklist and verify whether the insertion is successful
+     * @tc.name    Add multiple records to the blocklist and verify whether the insertion is successful
      * @tc.desc    Function test
      */
     it("contact_insertContactBlocklist_test_6800", 0, async function(done) {
@@ -4774,7 +4774,7 @@ describe('ContactsTest', function() {
 
     /**
      * @tc.number  contact_removeContactBlocklist_test_6900
-     * @tc.name    Delete multiple records from the blacklist and verify whether the deletion is successful
+     * @tc.name    Delete multiple records from the blocklist and verify whether the deletion is successful
      * @tc.desc    Function test
      */
     it("contact_removeContactBlocklist_test_6900", 0, async function(done) {
@@ -5963,8 +5963,8 @@ describe('ContactsTest', function() {
             var dataId1 = await insertData(rawContactId1, "phone", "1234567899600", "");
             console.info("logMessage abnormal_contact_insertblocklist_test_9600: dataId1 = " + dataId1);
 
-            var blacklist = {"phone_numbers" : "1234567899600"};
-            var code = await DAHelper.insert(contactBlocklistUri, blacklist);
+            var blocklist = {"phone_numbers" : "1234567899600"};
+            var code = await DAHelper.insert(contactBlocklistUri, blocklist);
             expect(code == -1).assertTrue();
             await deleteRawContact("abnormal_contact_insertblocklist_test_9600");
             await deleteAll(contactDataUri, "abnormal_contact_insertblocklist_test_9600");
diff --git a/jstest/Voicemail_test.js b/jstest/Voicemail_test.js
index 6d87b62d642ed90ae15f6bbeae6f08910f5ca134..a0c927db8f0a86961a3ffcdaea21d6dd604c1a09 100644
--- a/jstest/Voicemail_test.js
+++ b/jstest/Voicemail_test.js
@@ -552,7 +552,7 @@ describe('VoicemailTest', function() {
         var DAHelper = featureAbility.acquireDataAbilityHelper(URI_VOICEMAIL);
         console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper);
 
-        var insertValues = {"phone_numbers" : "18942010321", "display_name" : "xiaoming"};
+        var insertValues = {"phone_numbers" : "12345678901", "display_name" : "xiaoming"};
         try {
             var voicemailId = await DAHelper.insert(voicemailUri, insertValues);
             console.info("logMessage abnormal_voicemail_insert_test_300: voicemialId = " + voicemailId);
@@ -575,13 +575,13 @@ describe('VoicemailTest', function() {
         console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper);
         var errorUri = "dataability:///com.ohos.calllogability/calls/voicemails";
 
-        var insertValues = {"phone_number" : "18942010321", "display_name" : "xiaoming"};
+        var insertValues = {"phone_number" : "12345678901", "display_name" : "xiaoming"};
         try {
             var voicemialId = await DAHelper.insert(errorUri, insertValues)
             console.info("logMessage abnormal_voicemail_insert_test_400: voicemialId = " + voicemialId);
             expect(voicemialId == -1).assertTrue();
             var map = new Map();
-            map.set("phone_number", "18942010321");
+            map.set("phone_number", "12345678901");
             await voicemailQueryError(map, "abnormal_voicemail_insert_test_400");
             done();
         } catch (error) {
@@ -600,7 +600,7 @@ describe('VoicemailTest', function() {
         var DAHelper = featureAbility.acquireDataAbilityHelper(URI_VOICEMAIL);
         console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper);
 
-        var insertValues = {"phone_number" : "18942010321"};
+        var insertValues = {"phone_number" : "12345678901"};
         try {
             var voicemailId = await DAHelper.insert(voicemailUri, insertValues);
             console.info("logMessage abnormal_voicemail_update_test_1100: voicemailId = " + voicemailId);
@@ -925,14 +925,14 @@ describe('VoicemailTest', function() {
         console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper);
         console.info('logMessage uri = ' + URI_VOICEMAIL)
 
-        var stringValue = {"phone_number" : "1557544452542200", "voice_status" : 0};
+        var stringValue = {"phone_number" : "123456789012200", "voice_status" : 0};
         try {
             var voicemailId = await DAHelper.insert(voicemailUri, stringValue)
             console.info("logMessage voicemail_insert_test_2200: voicemailId = " + voicemailId);
             expect(voicemailId > 0).assertTrue();
             var map = new Map();
             map.set("id", voicemailId.toString());
-            map.set("phone_number", "1557544452542200");
+            map.set("phone_number", "123456789012200");
             map.set("voice_status", "0");
             await voicemailQuery(map, "voicemail_insert_test_2200");
             await voiceMailDelete("voicemail_insert_test_2200");
@@ -955,7 +955,7 @@ describe('VoicemailTest', function() {
         console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper);
         console.info('logMessage uri = ' + URI_VOICEMAIL)
 
-        var stringValue = {"phone_number" : "155754445254", "voice_status" : 0};
+        var stringValue = {"phone_number" : "12345678901", "voice_status" : 0};
         try {
             var voicemailId = await DAHelper.insert(voicemailUri, stringValue)
             var voicemailIdOne = await DAHelper.insert(voicemailUri, stringValue)
@@ -990,7 +990,7 @@ describe('VoicemailTest', function() {
         console.info('logMessage get DAHelper success! DAHelper = ' + DAHelper);
         console.info('logMessage uri = ' + URI_VOICEMAIL)
 
-        var stringValue = {"phone_number" : "155754445254", "voice_status" : 0};
+        var stringValue = {"phone_number" : "12345678901", "voice_status" : 0};
         try {
             var voicemailId = await DAHelper.insert(voicemailUri, stringValue)
             var voicemailIdOne = await DAHelper.insert(voicemailUri, stringValue)
diff --git a/jstest/common.js b/jstest/common.js
index 5cce3d1ac6d160f6e1ff6e176fbda384785eb254..84a135f946123ac0b13f93de44dd51759afb0975 100644
--- a/jstest/common.js
+++ b/jstest/common.js
@@ -678,17 +678,17 @@ export default {
         },
     getPhoneNumberBatch:
         function() {
-            var contactBlacklistValuesOne = {"phone_number" : "85525040585400"};
-            var contactBlacklistValuesTwo = {"phone_number" : "85525040585400"};
-            var contactBlacklistValuesThree = {"phone_number" : "85525040585400"};
-            var contactBlacklistValuesFour = {"phone_number" : "85525040585400"};
-            var contactBlacklistValuesFive = {"phone_number" : "85525040585400"};
+            var contactBlocklistValuesOne = {"phone_number" : "85525040585400"};
+            var contactBlocklistValuesTwo = {"phone_number" : "85525040585400"};
+            var contactBlocklistValuesThree = {"phone_number" : "85525040585400"};
+            var contactBlocklistValuesFour = {"phone_number" : "85525040585400"};
+            var contactBlocklistValuesFive = {"phone_number" : "85525040585400"};
             var listAddBluk = []
-            listAddBluk[0] = contactBlacklistValuesOne;
-            listAddBluk[1] = contactBlacklistValuesTwo;
-            listAddBluk[2] = contactBlacklistValuesThree;
-            listAddBluk[3] = contactBlacklistValuesFour;
-            listAddBluk[4] = contactBlacklistValuesFive;
+            listAddBluk[0] = contactBlocklistValuesOne;
+            listAddBluk[1] = contactBlocklistValuesTwo;
+            listAddBluk[2] = contactBlocklistValuesThree;
+            listAddBluk[3] = contactBlocklistValuesFour;
+            listAddBluk[4] = contactBlocklistValuesFive;
             return listAddBluk;
         },
     getSearchMap:
diff --git a/test/unittest/src/calllogability_test.cpp b/test/unittest/src/calllogability_test.cpp
index 89a49c2319a8ea5a8b46f53dd012027b76634149..8677703660a4b918563289d306462b58a9eac358 100644
--- a/test/unittest/src/calllogability_test.cpp
+++ b/test/unittest/src/calllogability_test.cpp
@@ -244,12 +244,13 @@ HWTEST_F(CalllogAbilityTest, calllog_Update_test_300, testing::ext::TestSize.Lev
     std::vector<std::string> columns;
     columns.push_back("phone_number");
     OHOS::NativeRdb::ValuesBucket valuesBucket;
-    valuesBucket.PutString("phone_number", "123456789055");
+    std::string phoneNumber = to_string((rand() % (900000000000))+10000000000);
+    valuesBucket.PutString("phone_number", phoneNumber);
     int rawId = CalllogInsertValues(valuesBucket);
     EXPECT_GT(rawId, 0);
 
     OHOS::NativeRdb::ValuesBucket updateValues;
-    updateValues.PutString("phone_number", "0987654321");
+    updateValues.PutString("phone_number", phoneNumber);
     OHOS::NativeRdb::DataAbilityPredicates predicates;
     predicates.EqualTo("id", std::to_string(rawId));
     int updateCode = CalllogUpdate(updateValues, predicates);
@@ -312,7 +313,8 @@ HWTEST_F(CalllogAbilityTest, calllog_Update_test_500, testing::ext::TestSize.Lev
 {
     HILOG_INFO("--- calllog_Update_test_500 is starting! ---");
     OHOS::NativeRdb::ValuesBucket valuesBucket;
-    valuesBucket.PutString("phone_number", "1234567890");
+    std::string phoneNumber = to_string((rand() % (900000000000))+10000000000);
+    valuesBucket.PutString("phone_number", phoneNumber);
     valuesBucket.PutString("display_name", "testName");
     CalllogInsertValues(valuesBucket);
     CalllogInsertValues(valuesBucket);
@@ -361,7 +363,8 @@ HWTEST_F(CalllogAbilityTest, calllog_Query_test_600, testing::ext::TestSize.Leve
     columns.push_back("display_name");
     columns.push_back("id");
     OHOS::NativeRdb::ValuesBucket valuesBucket;
-    valuesBucket.PutString("phone_number", "1234567890");
+    std::string phoneNumber = to_string((rand() % (900000000000))+10000000000);
+    valuesBucket.PutString("phone_number", phoneNumber);
     valuesBucket.PutString("display_name", "testName");
     int rawId = CalllogInsertValues(valuesBucket);
     EXPECT_GT(rawId, 0);
@@ -391,7 +394,8 @@ HWTEST_F(CalllogAbilityTest, calllog_Query_test_800, testing::ext::TestSize.Leve
     HILOG_INFO("-----calllog_Query_test_800 is starting!-----");
     int ringDuration = 9121215;
     OHOS::NativeRdb::ValuesBucket valuesBucket;
-    valuesBucket.PutString("phone_number", "1234567890");
+    std::string phoneNumber = to_string((rand() % (900000000000))+10000000000);
+    valuesBucket.PutString("phone_number", phoneNumber);
     valuesBucket.PutString("display_name", "testName");
     valuesBucket.PutInt("ring_duration", ringDuration);
     int rawId = CalllogInsertValues(valuesBucket);
@@ -429,7 +433,8 @@ HWTEST_F(CalllogAbilityTest, calllog_Query_test_900, testing::ext::TestSize.Leve
 {
     HILOG_INFO("-----calllog_Query_test_900 is starting!-----");
     OHOS::NativeRdb::ValuesBucket valuesBucket;
-    valuesBucket.PutString("phone_number", "12345678901254");
+    std::string phoneNumber = to_string((rand() % (900000000000))+10000000000);
+    valuesBucket.PutString("phone_number", phoneNumber);
     valuesBucket.PutString("display_name", "testName");
     CalllogInsertValues(valuesBucket);
     CalllogInsertValues(valuesBucket);
@@ -462,7 +467,8 @@ HWTEST_F(CalllogAbilityTest, calllog_Delete_test_1000, testing::ext::TestSize.Le
 {
     HILOG_INFO("--- calllog_Delete_test_1000 is starting! ---");
     OHOS::NativeRdb::ValuesBucket valuesBucket;
-    valuesBucket.PutString("phone_number", "1234567890");
+    std::string phoneNumber = to_string((rand() % (900000000000))+10000000000);
+    valuesBucket.PutString("phone_number", phoneNumber);
     std::vector<std::string> columns;
     int rawId = CalllogInsertValues(valuesBucket);
     EXPECT_GT(rawId, 0);
@@ -491,12 +497,13 @@ HWTEST_F(CalllogAbilityTest, calllog_Delete_test_1100, testing::ext::TestSize.Le
 {
     HILOG_INFO("--- calllog_Delete_test_1100 is starting! ---");
     OHOS::NativeRdb::ValuesBucket valuesBucket;
-    valuesBucket.PutString("phone_number", "1234567890");
+    std::string phoneNumber = to_string((rand() % (900000000000))+10000000000);
+    valuesBucket.PutString("phone_number", phoneNumber);
     int rawId = CalllogInsertValues(valuesBucket);
     EXPECT_GT(rawId, 0);
 
     OHOS::NativeRdb::ValuesBucket valuesBucketTwo;
-    valuesBucketTwo.PutString("phone_number", "18552504057");
+    valuesBucketTwo.PutString("phone_number", phoneNumber);
     int rawIdTwo = CalllogInsertValues(valuesBucketTwo);
     EXPECT_GT(rawIdTwo, 0);
     OHOS::NativeRdb::DataAbilityPredicates predicates;
@@ -760,7 +767,8 @@ HWTEST_F(CalllogAbilityTest, abnormal_calllog_Update_test_1700, testing::ext::Te
     HILOG_INFO("--- abnormal_calllog_Update_test_1700 is starting! ---");
     std::vector<std::string> columns;
     OHOS::NativeRdb::ValuesBucket valuesBucket;
-    valuesBucket.PutString("phone_number", "1234567890");
+    std::string phoneNumber = to_string((rand() % (900000000000))+10000000000);
+    valuesBucket.PutString("phone_number", phoneNumber);
     valuesBucket.PutString("display_name", "abnormal_sigle");
     columns.push_back("phone_number");
     columns.push_back("display_name");
@@ -768,7 +776,7 @@ HWTEST_F(CalllogAbilityTest, abnormal_calllog_Update_test_1700, testing::ext::Te
     EXPECT_GT(rawId, 0);
 
     OHOS::NativeRdb::ValuesBucket updateValues;
-    updateValues.PutString("phone_number_sha", "0987654321");
+    updateValues.PutString("phone_number_sha", phoneNumber);
     OHOS::NativeRdb::DataAbilityPredicates predicates;
     predicates.EqualTo("id", std::to_string(rawId));
     int updateCode = CalllogUpdate(updateValues, predicates);
@@ -797,13 +805,14 @@ HWTEST_F(CalllogAbilityTest, abnormal_calllog_Update_test_1800, testing::ext::Te
     HILOG_INFO("--- abnormal_calllog_Update_test_1800 is starting! ---");
     std::vector<std::string> columns;
     OHOS::NativeRdb::ValuesBucket valuesBucketOne;
-    valuesBucketOne.PutString("phone_number", "1234567890");
+    std::string phoneNumber = to_string((rand() % (900000000000))+10000000000);
+    valuesBucketOne.PutString("phone_number", phoneNumber);
     valuesBucketOne.PutInt("ring_duration", 998);
     int rawIdOne = CalllogInsertValues(valuesBucketOne);
     EXPECT_GT(rawIdOne, 0);
 
     OHOS::NativeRdb::ValuesBucket valuesBucketTwo;
-    valuesBucketTwo.PutString("phone_number", "638292093737");
+    valuesBucketTwo.PutString("phone_number", phoneNumber);
     valuesBucketTwo.PutInt("ring_duration", 999);
     int rawIdTwo = CalllogInsertValues(valuesBucketTwo);
     EXPECT_GT(rawIdTwo, 0);
@@ -812,7 +821,7 @@ HWTEST_F(CalllogAbilityTest, abnormal_calllog_Update_test_1800, testing::ext::Te
     columns.push_back("ring_duration");
 
     OHOS::NativeRdb::ValuesBucket updateValues;
-    updateValues.PutString("phone_number", "0987654321");
+    updateValues.PutString("phone_number", phoneNumber);
     updateValues.PutInt("ring_duration", 888);
     OHOS::NativeRdb::DataAbilityPredicates predicates;
     predicates.GreaterThan("id", "0");
@@ -1080,11 +1089,12 @@ HWTEST_F(CalllogAbilityTest, abnormal_calllog_delete_test_2600, testing::ext::Te
 
     OHOS::Uri errorUriCalllogs(CallLogUri::ERROR_URI);
     OHOS::NativeRdb::ValuesBucket valuesBucket;
-    valuesBucket.PutString("phone_number", "1234567890");
+    std::string phoneNumber = to_string((rand() % (900000000000))+10000000000);
+    valuesBucket.PutString("phone_number", phoneNumber);
     int calllogIdOne = CalllogInsertValues(valuesBucket);
     EXPECT_GT(calllogIdOne, 0);
     OHOS::NativeRdb::ValuesBucket valuesBucketTwo;
-    valuesBucketTwo.PutString("phone_number", "1234567890");
+    valuesBucketTwo.PutString("phone_number", phoneNumber);
     int calllogIdTwo = CalllogInsertValues(valuesBucketTwo);
     EXPECT_GT(calllogIdTwo, 0);
 
@@ -1125,13 +1135,14 @@ HWTEST_F(CalllogAbilityTest, abnormal_calllog_Update_test_2700, testing::ext::Te
     HILOG_INFO("--- abnormal_calllog_Update_test_2700 is starting! ---");
 
     OHOS::Uri errorUri(CallLogUri::ERROR_URI);
-    int64_t calllogIdOne = CalllogInsert("1234567890");
+    std::string phoneNumber = to_string((rand() % (900000000000))+10000000000);
+    int64_t calllogIdOne = CalllogInsert(phoneNumber);
     EXPECT_GT(calllogIdOne, 0);
-    int64_t calllogIdTwo = CalllogInsert("0987654321");
+    int64_t calllogIdTwo = CalllogInsert(phoneNumber);
     EXPECT_GT(calllogIdTwo, 0);
 
     OHOS::NativeRdb::ValuesBucket updateCalllogValues;
-    updateCalllogValues.PutString("phone_number", "998877");
+    updateCalllogValues.PutString("phone_number", phoneNumber);
     OHOS::NativeRdb::DataAbilityPredicates predicates;
     predicates.EqualTo("ids", std::to_string(calllogIdOne));
     int updateCode = CalllogUpdate(updateCalllogValues, predicates);
@@ -1139,7 +1150,7 @@ HWTEST_F(CalllogAbilityTest, abnormal_calllog_Update_test_2700, testing::ext::Te
     std::vector<std::string> columns;
     columns.push_back("phone_number");
     predicates.Clear();
-    predicates.EqualTo("phone_number", "998877");
+    predicates.EqualTo("phone_number", phoneNumber);
     std::shared_ptr<OHOS::NativeRdb::AbsSharedResultSet> resultSetOne = CalllogQuery(columns, predicates);
     int rowCountOne = 0;
     resultSetOne->GetRowCount(rowCountOne);
@@ -1147,7 +1158,7 @@ HWTEST_F(CalllogAbilityTest, abnormal_calllog_Update_test_2700, testing::ext::Te
 
     resultSetOne->Close();
     updateCalllogValues.Clear();
-    updateCalllogValues.PutString("phone_number", "987654");
+    updateCalllogValues.PutString("phone_number", phoneNumber);
     predicates.Clear();
     predicates.EqualTo("id", std::to_string(calllogIdTwo));
     updateCode = calllogAbility.Update(errorUri, updateCalllogValues, predicates);
@@ -1158,7 +1169,7 @@ HWTEST_F(CalllogAbilityTest, abnormal_calllog_Update_test_2700, testing::ext::Te
     resultSetTwo->GetRowCount(rowCountOne);
     EXPECT_EQ(0, rowCountTwo);
     OHOS::NativeRdb::ValuesBucket oldValue;
-    oldValue.PutString("phone_number", "0987654321");
+    oldValue.PutString("phone_number", phoneNumber);
     CheckResultSet(oldValue, resultSetTwo, "abnormal_calllog_Update_test_2700");
     ClearCallLog();
 }
diff --git a/test/unittest/src/calllogfuzzyquery_test.cpp b/test/unittest/src/calllogfuzzyquery_test.cpp
index 7c8904dbfa390048b67913371f0cf34a735c709a..b8cc28cef69aa4d275658918ae0074497ac78184 100644
--- a/test/unittest/src/calllogfuzzyquery_test.cpp
+++ b/test/unittest/src/calllogfuzzyquery_test.cpp
@@ -71,13 +71,14 @@ HWTEST_F(CalllogFuzzyQueryTest, calllog_Query_test_100, testing::ext::TestSize.L
 {
     HILOG_INFO("----calllog_Query_test_100 is starting!----");
     OHOS::NativeRdb::ValuesBucket valuesBucket;
-    valuesBucket.PutString("phone_number", "123456789");
+    std::string phoneNumber = to_string((rand() % (900000000000))+10000000000);
+    valuesBucket.PutString("phone_number", phoneNumber);
     int rawId = CalllogInsertValues(valuesBucket);
     EXPECT_GT(rawId, 0);
 
     valuesBucket.PutInt("id", rawId);
     OHOS::NativeRdb::ValuesBucket valuesBucketTwo;
-    valuesBucketTwo.PutString("phone_number", "1842794123");
+    valuesBucketTwo.PutString("phone_number", phoneNumber);
     rawId = CalllogInsertValues(valuesBucketTwo);
     valuesBucketTwo.PutInt("id", rawId);
     EXPECT_GT(rawId, 0);
@@ -114,12 +115,13 @@ HWTEST_F(CalllogFuzzyQueryTest, calllog_Query_test_200, testing::ext::TestSize.L
 {
     HILOG_INFO("----calllog_Query_test_200 is starting!----");
     OHOS::NativeRdb::ValuesBucket valuesBucket;
-    valuesBucket.PutString("phone_number", "1854250750");
+    std::string phoneNumber = to_string((rand() % (900000000000))+10000000000);
+    valuesBucket.PutString("phone_number", phoneNumber);
     int rawId = CalllogInsertValues(valuesBucket);
     EXPECT_GT(rawId, 0);
     valuesBucket.PutInt("id", rawId);
     OHOS::NativeRdb::ValuesBucket valuesBucketTwo;
-    valuesBucketTwo.PutString("phone_number", "17542368015");
+    valuesBucketTwo.PutString("phone_number", phoneNumber);
     rawId = CalllogInsertValues(valuesBucketTwo);
     valuesBucketTwo.PutInt("id", rawId);
     EXPECT_GT(rawId, 0);
@@ -152,12 +154,13 @@ HWTEST_F(CalllogFuzzyQueryTest, calllog_Query_test_300, testing::ext::TestSize.L
 {
     HILOG_INFO("----calllog_Query_test_300 is starting!----");
     OHOS::NativeRdb::ValuesBucket valuesBucket;
-    valuesBucket.PutString("phone_number", "12378418910");
+    std::string phoneNumber = to_string((rand() % (900000000000))+10000000000);
+    valuesBucket.PutString("phone_number", phoneNumber);
     int rawId = CalllogInsertValues(valuesBucket);
     EXPECT_GT(rawId, 0);
     valuesBucket.PutInt("id", rawId);
     OHOS::NativeRdb::ValuesBucket valuesBucketTwo;
-    valuesBucketTwo.PutString("phone_number", "12374589961");
+    valuesBucketTwo.PutString("phone_number", phoneNumber);
     rawId = CalllogInsertValues(valuesBucketTwo);
     valuesBucketTwo.PutInt("id", rawId);
     EXPECT_GT(rawId, 0);
@@ -165,7 +168,7 @@ HWTEST_F(CalllogFuzzyQueryTest, calllog_Query_test_300, testing::ext::TestSize.L
     columns.push_back("id");
     columns.push_back("phone_number");
     OHOS::NativeRdb::DataAbilityPredicates predicates;
-    predicates.Like("phone_number", "1238910516156465%");
+    predicates.Like("phone_number", phoneNumber);
     predicates.OrderByAsc("id");
     std::shared_ptr<OHOS::NativeRdb::AbsSharedResultSet> resultSet = CalllogQuery(columns, predicates);
     // resultSet count 0
@@ -188,12 +191,13 @@ HWTEST_F(CalllogFuzzyQueryTest, calllog_Query_test_400, testing::ext::TestSize.L
 {
     HILOG_INFO("----calllog_Query_test_400 is starting!----");
     OHOS::NativeRdb::ValuesBucket valuesBucket;
-    valuesBucket.PutString("phone_number", "17778418910");
+    std::string phoneNumber = to_string((rand() % (900000000000))+10000000000);
+    valuesBucket.PutString("phone_number", phoneNumber);
     int rawId = CalllogInsertValues(valuesBucket);
     EXPECT_GT(rawId, 0);
     valuesBucket.PutInt("id", rawId);
     OHOS::NativeRdb::ValuesBucket valuesBucketTwo;
-    valuesBucketTwo.PutString("phone_number", "12378451245");
+    valuesBucketTwo.PutString("phone_number", phoneNumber);
     rawId = CalllogInsertValues(valuesBucketTwo);
     valuesBucketTwo.PutInt("id", rawId);
     EXPECT_GT(rawId, 0);
@@ -225,13 +229,14 @@ HWTEST_F(CalllogFuzzyQueryTest, abnormal_calllog_Query_test_500, testing::ext::T
 {
     HILOG_INFO("----abnormal_calllog_Query_test_500 is starting!----");
     OHOS::NativeRdb::ValuesBucket valuesBucket;
-    valuesBucket.PutString("phone_number", "12378418910");
+    std::string phoneNumber = to_string((rand() % (900000000000))+10000000000);
+    valuesBucket.PutString("phone_number", phoneNumber);
     int rawId = CalllogInsertValues(valuesBucket);
     EXPECT_GT(rawId, 0);
 
     valuesBucket.PutInt("id", rawId);
     OHOS::NativeRdb::ValuesBucket valuesBucketTwo;
-    valuesBucketTwo.PutString("phone_number", "12374589961");
+    valuesBucketTwo.PutString("phone_number", phoneNumber);
     rawId = CalllogInsertValues(valuesBucketTwo);
     valuesBucketTwo.PutInt("id", rawId);
     EXPECT_GT(rawId, 0);
@@ -240,7 +245,7 @@ HWTEST_F(CalllogFuzzyQueryTest, abnormal_calllog_Query_test_500, testing::ext::T
     columns.push_back("id");
     columns.push_back("phone_number");
     OHOS::NativeRdb::DataAbilityPredicates predicates;
-    predicates.Like("phone_numbers", "1238910516156465%");
+    predicates.Like("phone_numbers", phoneNumber);
     predicates.OrderByAsc("id");
     std::shared_ptr<OHOS::NativeRdb::AbsSharedResultSet> resultSet = CalllogQuery(columns, predicates);
     int rowCount = 0;
diff --git a/test/unittest/src/contactability_test.cpp b/test/unittest/src/contactability_test.cpp
index 1188c6a646cdb6c479c2156c3e5645de3177853d..c9f596ee79e8f3c8a11637dc7c904d1f7fd12aab 100644
--- a/test/unittest/src/contactability_test.cpp
+++ b/test/unittest/src/contactability_test.cpp
@@ -85,9 +85,9 @@ int64_t ContactAbilityTest::GroupsInsert(std::string groupName, OHOS::NativeRdb:
 int64_t ContactAbilityTest::ContactBlocklistInsert(
     std::string phoneNumber, OHOS::NativeRdb::ValuesBucket &contactBlocklistValues)
 {
-    OHOS::Uri uriBlacklist(ContactsUri::BLOCKLIST);
+    OHOS::Uri uriBlocklist(ContactsUri::BLOCKLIST);
     contactBlocklistValues.PutString("phone_number", phoneNumber);
-    int64_t code = contactsDataAbility.Insert(uriBlacklist, contactBlocklistValues);
+    int64_t code = contactsDataAbility.Insert(uriBlocklist, contactBlocklistValues);
     return code;
 }
 
@@ -2945,25 +2945,26 @@ HWTEST_F(ContactAbilityTest, contact_Update_test_5800, testing::ext::TestSize.Le
 HWTEST_F(ContactAbilityTest, contact_BatchInsertAndDelete_test_5900, testing::ext::TestSize.Level1)
 {
     HILOG_INFO("--- contact_BatchInsertAndDelete_test_5900 is starting! ---");
-    OHOS::Uri uriContactBlacklist(ContactsUri::BLOCKLIST);
-    OHOS::NativeRdb::ValuesBucket contactBlacklistValuesOne;
-    contactBlacklistValuesOne.PutString("phone_number", "147258369");
-    OHOS::NativeRdb::ValuesBucket contactBlacklistValuesTwo;
-    contactBlacklistValuesTwo.PutString("phone_number", "963852741");
-    OHOS::NativeRdb::ValuesBucket contactBlacklistValuesThree;
-    contactBlacklistValuesThree.PutString("phone_number", "1234789602");
+    OHOS::Uri uriContactBlocklist(ContactsUri::BLOCKLIST);
+    OHOS::NativeRdb::ValuesBucket contactBlocklistValuesOne;
+    std::string phoneNumber = to_string((rand() % (900000000000))+10000000000);
+    contactBlocklistValuesOne.PutString("phone_number", phoneNumber);
+    OHOS::NativeRdb::ValuesBucket contactBlocklistValuesTwo;
+    contactBlocklistValuesTwo.PutString("phone_number", phoneNumber);
+    OHOS::NativeRdb::ValuesBucket contactBlocklistValuesThree;
+    contactBlocklistValuesThree.PutString("phone_number", phoneNumber);
 
     std::vector<OHOS::NativeRdb::ValuesBucket> listAddBluk;
-    listAddBluk.push_back(contactBlacklistValuesOne);
-    listAddBluk.push_back(contactBlacklistValuesTwo);
-    listAddBluk.push_back(contactBlacklistValuesThree);
-    int batchInsertCode = contactsDataAbility.BatchInsert(uriContactBlacklist, listAddBluk);
+    listAddBluk.push_back(contactBlocklistValuesOne);
+    listAddBluk.push_back(contactBlocklistValuesTwo);
+    listAddBluk.push_back(contactBlocklistValuesThree);
+    int batchInsertCode = contactsDataAbility.BatchInsert(uriContactBlocklist, listAddBluk);
     EXPECT_EQ(batchInsertCode, 0);
 
     OHOS::NativeRdb::DataAbilityPredicates predicates;
-    predicates.EqualTo("phone_number", std::string("147258369"));
+    predicates.EqualTo("phone_number", std::string(phoneNumber));
     predicates.Or();
-    predicates.EqualTo("phone_number", std::string("963852741"));
+    predicates.EqualTo("phone_number", std::string(phoneNumber));
     std::string contactBlocklist = ContactTabName::CONTACT_BLOCKLIST;
     int deleteCode = ContactDelete(contactBlocklist, predicates);
     EXPECT_EQ(deleteCode, 0);
diff --git a/test/unittest/src/contactprofile_test.cpp b/test/unittest/src/contactprofile_test.cpp
index b3a8cd9ed703e3b3c8a9ecda426f00a3ad8b93fb..e208e5dcedf4b7050c3ef664250047cdf9f344af 100644
--- a/test/unittest/src/contactprofile_test.cpp
+++ b/test/unittest/src/contactprofile_test.cpp
@@ -87,9 +87,9 @@ int64_t ContactProfileTest::GroupsInsert(std::string groupName, OHOS::NativeRdb:
 int64_t ContactProfileTest::ContactBlocklistInsert(
     std::string phoneNumber, OHOS::NativeRdb::ValuesBucket &contactBlocklistValues)
 {
-    OHOS::Uri uriBlacklist(ProfileUri::BLOCKLIST);
+    OHOS::Uri uriBlocklist(ProfileUri::BLOCKLIST);
     contactBlocklistValues.PutString("phone_number", phoneNumber);
-    int64_t code = contactsDataAbility.Insert(uriBlacklist, contactBlocklistValues);
+    int64_t code = contactsDataAbility.Insert(uriBlocklist, contactBlocklistValues);
     return code;
 }
 
@@ -2943,25 +2943,26 @@ HWTEST_F(ContactProfileTest, contactProfile_Update_test_5800, testing::ext::Test
 HWTEST_F(ContactProfileTest, contactProfile_BatchInsertAndDelete_test_5900, testing::ext::TestSize.Level1)
 {
     HILOG_INFO("--- contactProfile_BatchInsertAndDelete_test_5900 is starting! ---");
-    OHOS::Uri uriContactBlacklist(ProfileUri::BLOCKLIST);
-    OHOS::NativeRdb::ValuesBucket contactBlacklistValuesOne;
-    contactBlacklistValuesOne.PutString("phone_number", "147258369");
-    OHOS::NativeRdb::ValuesBucket contactBlacklistValuesTwo;
-    contactBlacklistValuesTwo.PutString("phone_number", "963852741");
-    OHOS::NativeRdb::ValuesBucket contactBlacklistValuesThree;
-    contactBlacklistValuesThree.PutString("phone_number", "1234789602");
+    OHOS::Uri uriContactBlocklist(ProfileUri::BLOCKLIST);
+    OHOS::NativeRdb::ValuesBucket contactBlocklistValuesOne;
+    std::string phoneNumber = to_string((rand() % (900000000000))+10000000000);
+    contactBlocklistValuesOne.PutString("phone_number", phoneNumber);
+    OHOS::NativeRdb::ValuesBucket contactBlocklistValuesTwo;
+    contactBlocklistValuesTwo.PutString("phone_number", phoneNumber);
+    OHOS::NativeRdb::ValuesBucket contactBlocklistValuesThree;
+    contactBlocklistValuesThree.PutString("phone_number", phoneNumber);
 
     std::vector<OHOS::NativeRdb::ValuesBucket> listAddBluk;
-    listAddBluk.push_back(contactBlacklistValuesOne);
-    listAddBluk.push_back(contactBlacklistValuesTwo);
-    listAddBluk.push_back(contactBlacklistValuesThree);
-    int batchInsertCode = contactsDataAbility.BatchInsert(uriContactBlacklist, listAddBluk);
+    listAddBluk.push_back(contactBlocklistValuesOne);
+    listAddBluk.push_back(contactBlocklistValuesTwo);
+    listAddBluk.push_back(contactBlocklistValuesThree);
+    int batchInsertCode = contactsDataAbility.BatchInsert(uriContactBlocklist, listAddBluk);
     EXPECT_EQ(batchInsertCode, 0);
 
     OHOS::NativeRdb::DataAbilityPredicates predicates;
-    predicates.EqualTo("phone_number", std::string("147258369"));
+    predicates.EqualTo("phone_number", std::string(phoneNumber));
     predicates.Or();
-    predicates.EqualTo("phone_number", std::string("963852741"));
+    predicates.EqualTo("phone_number", std::string(phoneNumber));
     std::string contactBlocklist = ContactTabName::CONTACT_BLOCKLIST;
     int deleteCode = ContactDelete(contactBlocklist, predicates);
     EXPECT_EQ(deleteCode, 0);
diff --git a/test/unittest/src/voicemailability_test.cpp b/test/unittest/src/voicemailability_test.cpp
index 42304a580e63fbb50b01b4a33a465af366e5b9c6..3a01d1ea8cb269eda9f6d8f99881732c13d14a75 100644
--- a/test/unittest/src/voicemailability_test.cpp
+++ b/test/unittest/src/voicemailability_test.cpp
@@ -92,7 +92,8 @@ OHOS::NativeRdb::ValuesBucket VoicemailAbilityTest::GetVoiceMailValues(
 {
     std::string voiceMailTestStringValue = std::to_string(ContactsRand());
     OHOS::NativeRdb::ValuesBucket valuesBucket;
-    valuesBucket.PutString("phone_number", "15412121" + voiceMailTestStringValue);
+    std::string phoneNumber = to_string((rand() % (900000000000))+10000000000);
+    valuesBucket.PutString("phone_number", phoneNumber + voiceMailTestStringValue);
     valuesBucket.PutString("quicksearch_key", "dfquicksearch_key" + voiceMailTestStringValue);
     valuesBucket.PutString("display_name", "dfName" + voiceMailTestStringValue);
     valuesBucket.PutString("voicemail_uri", "dfUri::voicemail_uri" + voiceMailTestStringValue);
@@ -149,7 +150,8 @@ HWTEST_F(VoicemailAbilityTest, voicemail_Insert_test_100, testing::ext::TestSize
 {
     HILOG_INFO("--- voicemail_Insert_test_100 is starting! ---");
     OHOS::NativeRdb::ValuesBucket values;
-    values.PutString("phone_number", "166320");
+    std::string phoneNumber = to_string((rand() % (900000000000))+10000000000);
+    values.PutString("phone_number", phoneNumber);
     values.PutInt("voice_status", 1);
     int voicemailId = VoicemailInsertValues(values);
     HILOG_INFO("voicemail_Insert_test_100 : voicemailId = %{public}d", voicemailId);
@@ -180,7 +182,8 @@ HWTEST_F(VoicemailAbilityTest, voicemail_Insert_test_200, testing::ext::TestSize
 {
     HILOG_INFO("--- voicemail_Insert_test_200 is staring! ---");
     OHOS::NativeRdb::ValuesBucket values;
-    values.PutString("phone_number", "154236");
+    std::string phoneNumber = to_string((rand() % (900000000000))+10000000000);
+    values.PutString("phone_number", phoneNumber);
     int voicemailId = VoicemailInsertValues(values);
     HILOG_INFO("voicemail_Insert_test_200 : voicemailId = %{public}d", voicemailId);
     EXPECT_GT(voicemailId, 0);
@@ -244,7 +247,8 @@ HWTEST_F(VoicemailAbilityTest, voicemail_Update_test_400, testing::ext::TestSize
 {
     HILOG_INFO("--- voicemail_Update_test_400 is starting! ---");
     OHOS::NativeRdb::ValuesBucket values;
-    values.PutString("phone_number", "4396");
+    std::string phoneNumber = to_string((rand() % (900000000000))+10000000000);
+    values.PutString("phone_number", phoneNumber);
     values.PutInt("voice_status", 1);
     int voicemailId = VoicemailInsertValues(values);
     EXPECT_GT(voicemailId, 0);
@@ -282,7 +286,8 @@ HWTEST_F(VoicemailAbilityTest, voicemail_Delete_test_500, testing::ext::TestSize
 {
     HILOG_INFO("--- voicemail_Delete_test_500 is starting! ---");
     OHOS::NativeRdb::ValuesBucket values;
-    values.PutString("phone_number", "154236");
+    std::string phoneNumber = to_string((rand() % (900000000000))+10000000000);
+    values.PutString("phone_number", phoneNumber);
     int voicemailId = VoicemailInsertValues(values);
     HILOG_INFO("voicemail_Delete_test_500 : voicemailId = %{public}d", voicemailId);
     EXPECT_GT(voicemailId, 0);
@@ -319,19 +324,20 @@ HWTEST_F(VoicemailAbilityTest, voicemail_Delete_test_600, testing::ext::TestSize
 {
     HILOG_INFO("--- voicemail_Delete_test_600 is staring! ---");
     OHOS::NativeRdb::ValuesBucket valuesOne;
-    valuesOne.PutString("phone_number", "1000111");
+    std::string phoneNumber = to_string((rand() % (900000000000))+10000000000);
+    valuesOne.PutString("phone_number", phoneNumber);
     int voicemailIdOne = VoicemailInsertValues(valuesOne);
     HILOG_INFO("voicemail_Delete_test_600 : voicemailIdOne = %{public}d", voicemailIdOne);
     EXPECT_GT(voicemailIdOne, 0);
 
     OHOS::NativeRdb::ValuesBucket valuesTwo;
-    valuesTwo.PutString("phone_number", "1000111");
+    valuesTwo.PutString("phone_number", phoneNumber);
     int voicemailIdTwo = VoicemailInsertValues(valuesTwo);
     HILOG_INFO("voicemail_Delete_test_600 : voicemailIdTwo = %{public}d", voicemailIdTwo);
     EXPECT_GT(voicemailIdTwo, 0);
 
     OHOS::NativeRdb::ValuesBucket valuesThree;
-    valuesThree.PutString("phone_number", "1000111");
+    valuesThree.PutString("phone_number", phoneNumber);
     int voicemailIdThree = VoicemailInsertValues(valuesThree);
     HILOG_INFO("voicemail_Delete_test_600 : voicemailIdThree = %{public}d", voicemailIdThree);
     EXPECT_GT(voicemailIdThree, 0);
@@ -410,10 +416,11 @@ HWTEST_F(VoicemailAbilityTest, voicemail_Delete_test_800, testing::ext::TestSize
 {
     HILOG_INFO("--- voicemail_Delete_test_800 is starting!---");
     OHOS::NativeRdb::ValuesBucket voicemailValues;
-    voicemailValues.PutString("phone_number", "154236");
+    std::string phoneNumber = to_string((rand() % (900000000000))+10000000000);
+    voicemailValues.PutString("phone_number", phoneNumber);
     int voicemailIdOne = VoicemailInsertValues(voicemailValues);
     EXPECT_GT(voicemailIdOne, 0);
-    voicemailValues.PutString("phone_number", "154236");
+    voicemailValues.PutString("phone_number", phoneNumber);
     int voicemailIdTwo = VoicemailInsertValues(voicemailValues);
     EXPECT_GT(voicemailIdTwo, 0);
 
@@ -455,7 +462,8 @@ HWTEST_F(VoicemailAbilityTest, voicemail_Update_test_900, testing::ext::TestSize
 {
     HILOG_INFO("--- voicemail_Update_test_900 is starting! ---");
     OHOS::NativeRdb::ValuesBucket values;
-    values.PutString("phone_number", "166323340");
+    std::string phoneNumber = to_string((rand() % (900000000000))+10000000000);
+    values.PutString("phone_number", phoneNumber);
     values.PutInt("voice_status", 0);
     int voicemailId = VoicemailInsertValues(values);
     HILOG_INFO("voicemail_Update_test_900 : voicemailId = %{public}d", voicemailId);
@@ -468,7 +476,7 @@ HWTEST_F(VoicemailAbilityTest, voicemail_Update_test_900, testing::ext::TestSize
     int updateCode = VoicemailUpdate(updateValues, predicates);
     EXPECT_EQ(updateCode, 0);
 
-    updateValues.PutString("phone_number", "166323340");
+    updateValues.PutString("phone_number", phoneNumber);
     predicates.Clear();
     predicates.EqualTo("id", std::to_string(voicemailId));
     std::vector<std::string> columns;
@@ -500,7 +508,8 @@ HWTEST_F(VoicemailAbilityTest, voicemail_Update_test_1000, testing::ext::TestSiz
     EXPECT_GT(voicemailId, 0);
 
     OHOS::NativeRdb::ValuesBucket updateValues;
-    updateValues.PutString("phone_number", std::string("18522547896"));
+    std::string phoneNumber = to_string((rand() % (900000000000))+10000000000);
+    updateValues.PutString("phone_number", std::string(phoneNumber));
     OHOS::NativeRdb::DataAbilityPredicates predicates;
     predicates.EqualTo("id", std::to_string(voicemailId));
     int updateCode = VoicemailUpdate(updateValues, predicates);
@@ -531,29 +540,30 @@ HWTEST_F(VoicemailAbilityTest, voicemail_Update_test_1100, testing::ext::TestSiz
 {
     HILOG_INFO("--- voicemail_Update_test_1100 is staring! ---");
     OHOS::NativeRdb::ValuesBucket valuesOne;
-    valuesOne.PutString("phone_number", "177888855");
+    std::string phoneNumber = to_string((rand() % (900000000000))+10000000000);
+    valuesOne.PutString("phone_number", phoneNumber);
     int voicemailIdOne = VoicemailInsertValues(valuesOne);
     EXPECT_GT(voicemailIdOne, 0);
 
     OHOS::NativeRdb::ValuesBucket valuesTwo;
-    valuesTwo.PutString("phone_number", "177888856");
+    valuesTwo.PutString("phone_number", phoneNumber);
     int voicemailIdTwo = VoicemailInsertValues(valuesTwo);
     EXPECT_GT(voicemailIdTwo, 0);
 
     OHOS::NativeRdb::ValuesBucket valuesThree;
-    valuesThree.PutString("phone_number", "177888856");
+    valuesThree.PutString("phone_number", phoneNumber);
     int voicemailIdThree = VoicemailInsertValues(valuesThree);
     EXPECT_GT(voicemailIdThree, 0);
 
     OHOS::NativeRdb::ValuesBucket updateValues;
-    updateValues.PutString("phone_number", std::string("20014455"));
+    updateValues.PutString("phone_number", std::string(phoneNumber));
     OHOS::NativeRdb::DataAbilityPredicates predicates;
     predicates.EqualTo("id", std::to_string(voicemailIdOne));
     int updateCode = VoicemailUpdate(updateValues, predicates);
     EXPECT_EQ(updateCode, 0);
 
     OHOS::NativeRdb::ValuesBucket updateValuesTwo;
-    updateValuesTwo.PutString("phone_number", std::string("1993025"));
+    updateValuesTwo.PutString("phone_number", std::string(phoneNumber));
     predicates.Clear();
     predicates.EqualTo("id", std::to_string(voicemailIdTwo));
     updateCode = VoicemailUpdate(updateValuesTwo, predicates);
@@ -627,10 +637,11 @@ HWTEST_F(VoicemailAbilityTest, voicemail_Update_test_1300, testing::ext::TestSiz
 {
     HILOG_INFO("--- voicemail_Update_test_1300 is starting!---");
     OHOS::NativeRdb::ValuesBucket voicemailValues;
-    voicemailValues.PutString("phone_number", "154236");
+    std::string phoneNumber = to_string((rand() % (900000000000))+10000000000);
+    voicemailValues.PutString("phone_number", phoneNumber);
     int voicemailIdOne = VoicemailInsertValues(voicemailValues);
     EXPECT_GT(voicemailIdOne, 0);
-    voicemailValues.PutString("phone_number", "154236");
+    voicemailValues.PutString("phone_number", phoneNumber);
     int voicemailIdTwo = VoicemailInsertValues(voicemailValues);
     EXPECT_GT(voicemailIdTwo, 0);
     OHOS::NativeRdb::DataAbilityPredicates predicates;
@@ -680,7 +691,8 @@ HWTEST_F(VoicemailAbilityTest, voicemail_Query_test_1400, testing::ext::TestSize
 {
     HILOG_INFO("--- voicemail_Query_test_1400 is starting! ---");
     OHOS::NativeRdb::ValuesBucket values;
-    values.PutString("phone_number", "882203110");
+    std::string phoneNumber = to_string((rand() % (900000000000))+10000000000);
+    values.PutString("phone_number", phoneNumber);
     values.PutInt("voice_status", 1);
     int voicemailId = VoicemailInsertValues(values);
     HILOG_INFO("voicemail_Query_test_1400 : voicemailId = %{public}d", voicemailId);
@@ -750,7 +762,8 @@ HWTEST_F(VoicemailAbilityTest, voicemail_Query_test_1600, testing::ext::TestSize
     EXPECT_GT(voicemailIdOne, 0);
 
     OHOS::NativeRdb::ValuesBucket valuesTwo;
-    valuesTwo.PutString("phone_number", "891320");
+    std::string phoneNumber = to_string((rand() % (900000000000))+10000000000);
+    valuesTwo.PutString("phone_number", phoneNumber);
     int voicemailIdTwo = VoicemailInsertValues(valuesTwo);
     HILOG_INFO("voicemail_Query_test_1600 : voicemailIdTwo = %{public}d", voicemailIdTwo);
     EXPECT_GT(voicemailIdTwo, 0);
@@ -812,13 +825,14 @@ HWTEST_F(VoicemailAbilityTest, voicemail_BatchInsert_test_1800, testing::ext::Te
 
     OHOS::Uri uriData(VoicemailUri::VOICEMAIL);
     OHOS::NativeRdb::ValuesBucket voicemailValuesOne;
-    voicemailValuesOne.PutString("phone_number", std::string("1470023"));
+    std::string phoneNumber = to_string((rand() % (900000000000))+10000000000);
+    voicemailValuesOne.PutString("phone_number", std::string(phoneNumber));
     voicemailValuesOne.PutInt("voice_status", 1);
     OHOS::NativeRdb::ValuesBucket voicemailValuesTwo;
-    voicemailValuesTwo.PutString("phone_number", std::string("1470056"));
+    voicemailValuesTwo.PutString("phone_number", std::string(phoneNumber));
     voicemailValuesTwo.PutInt("voice_status", 0);
     OHOS::NativeRdb::ValuesBucket voicemailValuesThree;
-    voicemailValuesThree.PutString("phone_number", std::string("1470089"));
+    voicemailValuesThree.PutString("phone_number", std::string(phoneNumber));
     voicemailValuesThree.PutInt("voice_status", 0);
 
     std::vector<OHOS::NativeRdb::ValuesBucket> listAddBluk;
@@ -829,9 +843,9 @@ HWTEST_F(VoicemailAbilityTest, voicemail_BatchInsert_test_1800, testing::ext::Te
     EXPECT_EQ(batchInsertCode, 0);
 
     OHOS::NativeRdb::DataAbilityPredicates predicates;
-    predicates.EqualTo("phone_number", "1470023");
+    predicates.EqualTo("phone_number", phoneNumber);
     predicates.Or();
-    predicates.EqualTo("phone_number", "1470089");
+    predicates.EqualTo("phone_number", phoneNumber);
     predicates.OrderByAsc("id");
     std::vector<std::string> columns;
     columns.push_back("phone_number");
@@ -860,19 +874,20 @@ HWTEST_F(VoicemailAbilityTest, voicemail_BatchInsert_test_1900, testing::ext::Te
     HILOG_INFO("--- voicemail_BatchInsert_test_1900 is staring! ---");
     OHOS::Uri uriData(VoicemailUri::VOICEMAIL);
     OHOS::NativeRdb::ValuesBucket voicemailValuesOne;
-    voicemailValuesOne.PutString("phone_number", std::string("123478"));
+    std::string phoneNumber = to_string((rand() % (900000000000))+10000000000);
+    voicemailValuesOne.PutString("phone_number", std::string(phoneNumber));
     voicemailValuesOne.PutString("display_name", std::string("xiaoming"));
     OHOS::NativeRdb::ValuesBucket voicemailValuesTwo;
-    voicemailValuesTwo.PutString("phone_number", std::string("10002"));
+    voicemailValuesTwo.PutString("phone_number", std::string(phoneNumber));
     voicemailValuesTwo.PutString("display_name", std::string("xiaozi"));
     OHOS::NativeRdb::ValuesBucket voicemailValuesThree;
-    voicemailValuesThree.PutString("phone_number", std::string("10003"));
+    voicemailValuesThree.PutString("phone_number", std::string(phoneNumber));
     voicemailValuesThree.PutString("display_name", std::string("xiaozhi"));
     OHOS::NativeRdb::ValuesBucket voicemailValuesFour;
-    voicemailValuesFour.PutString("phone_number", std::string("10004"));
+    voicemailValuesFour.PutString("phone_number", std::string(phoneNumber));
     voicemailValuesFour.PutString("display_name", std::string("xiaohei"));
     OHOS::NativeRdb::ValuesBucket voicemailValuesFive;
-    voicemailValuesFive.PutString("phone_number", std::string("10005"));
+    voicemailValuesFive.PutString("phone_number", std::string(phoneNumber));
     voicemailValuesFive.PutString("display_name", std::string("xiaohong"));
     std::vector<OHOS::NativeRdb::ValuesBucket> listAddBluk;
     listAddBluk.push_back(voicemailValuesOne);
@@ -1017,7 +1032,8 @@ HWTEST_F(VoicemailAbilityTest, abnormal_voicemail_Delete_test_2300, testing::ext
 {
     HILOG_INFO("--- abnormal_voicemail_Delete_test_2300 is starting! ---");
     OHOS::NativeRdb::ValuesBucket values;
-    values.PutString("phone_number", "10086123");
+    std::string phoneNumber = to_string((rand() % (900000000000))+10000000000);
+    values.PutString("phone_number", phoneNumber);
     int voicemailId = VoicemailInsertValues(values);
     HILOG_INFO("abnormal_voicemail_Delete_test_2300 : voicemailId = %{public}d", voicemailId);
     EXPECT_GT(voicemailId, 0);
@@ -1051,7 +1067,8 @@ HWTEST_F(VoicemailAbilityTest, abnormal_voicemail_Delete_test_2400, testing::ext
 {
     HILOG_INFO("--- abnormal_voicemail_Delete_test_2400 is starting! ---");
     OHOS::NativeRdb::ValuesBucket values;
-    values.PutString("phone_number", "166320");
+    std::string phoneNumber = to_string((rand() % (900000000000))+10000000000);
+    values.PutString("phone_number", phoneNumber);
     int voicemailId = VoicemailInsertValues(values);
     HILOG_INFO("abnormal_voicemail_Delete_test_2400 : voicemailId = %{public}d", voicemailId);
     EXPECT_GT(voicemailId, 0);
@@ -1123,13 +1140,14 @@ HWTEST_F(VoicemailAbilityTest, abnormal_voicemail_Update_test_2600, testing::ext
 {
     HILOG_INFO("--- abnormal_voicemail_Update_test_2600 is staring! ---");
     OHOS::NativeRdb::ValuesBucket values;
-    values.PutString("phone_number", "11100886622");
+    std::string phoneNumber = to_string((rand() % (900000000000))+10000000000);
+    values.PutString("phone_number", phoneNumber);
     int voicemailId = VoicemailInsertValues(values);
     HILOG_INFO("abnormal_voicemail_Update_test_2600 : voicemailId = %{public}d", voicemailId);
     EXPECT_GT(voicemailId, 0);
 
     OHOS::NativeRdb::ValuesBucket updateValues;
-    updateValues.PutString("phone_number", std::string("18522547896"));
+    updateValues.PutString("phone_number", std::string(phoneNumber));
     OHOS::NativeRdb::DataAbilityPredicates predicates;
     predicates.EqualTo("ids", std::to_string(voicemailId));
     int updateCode = VoicemailUpdate(updateValues, predicates);
@@ -1150,14 +1168,15 @@ HWTEST_F(VoicemailAbilityTest, abnormal_voicemail_Update_test_2700, testing::ext
 {
     HILOG_INFO("--- abnormal_voicemail_Update_test_2700 is staring! ---");
     OHOS::NativeRdb::ValuesBucket values;
-    values.PutString("phone_number", "188520");
+    std::string phoneNumber = to_string((rand() % (900000000000))+10000000000);
+    values.PutString("phone_number", phoneNumber);
     int voicemailId = VoicemailInsertValues(values);
     HILOG_INFO("abnormal_voicemail_Update_test_2700 : voicemailId = %{public}d", voicemailId);
     EXPECT_GT(voicemailId, 0);
 
     OHOS::Uri uriVoicemails(VoicemailUri::ERROR_URI);
     OHOS::NativeRdb::ValuesBucket updateValues;
-    updateValues.PutString("phone_number", std::string("18522547896"));
+    updateValues.PutString("phone_number", std::string(phoneNumber));
     OHOS::NativeRdb::DataAbilityPredicates predicates;
     predicates.EqualTo("id", std::to_string(voicemailId));
     int updateCode = voicemailAbility.Update(uriVoicemails, updateValues, predicates);
@@ -1282,13 +1301,14 @@ HWTEST_F(VoicemailAbilityTest, abnormal_voicemail_BatchInsert_test_3200, testing
     HILOG_INFO("--- abnormal_voicemail_BatchInsert_test_3200 is starting! ---");
     OHOS::Uri uriData(VoicemailUri::VOICEMAIL);
     OHOS::NativeRdb::ValuesBucket voicemailValuesOne;
-    voicemailValuesOne.PutString("phone_number", std::string("147002366666666"));
+    std::string phoneNumber = to_string((rand() % (900000000000))+10000000000);
+    voicemailValuesOne.PutString("phone_number", std::string(phoneNumber));
     voicemailValuesOne.PutInt("voice_status", 1);
     OHOS::NativeRdb::ValuesBucket voicemailValuesTwo;
-    voicemailValuesTwo.PutString("phone_numbers", std::string("1470056"));
+    voicemailValuesTwo.PutString("phone_numbers", std::string(phoneNumber));
     voicemailValuesTwo.PutInt("voice_statuss", 0);
     OHOS::NativeRdb::ValuesBucket voicemailValuesThree;
-    voicemailValuesThree.PutString("phone_number", std::string("1470089"));
+    voicemailValuesThree.PutString("phone_number", std::string(phoneNumber));
     voicemailValuesThree.PutInt("voice_status", 0);
 
     std::vector<OHOS::NativeRdb::ValuesBucket> listAddBluk;
@@ -1299,11 +1319,12 @@ HWTEST_F(VoicemailAbilityTest, abnormal_voicemail_BatchInsert_test_3200, testing
     EXPECT_EQ(batchInsertCode, -1);
 
     OHOS::NativeRdb::DataAbilityPredicates predicates;
-    predicates.EqualTo("phone_number", "147002366666666");
+    std::string phoneNumber = to_string((rand() % (900000000000))+10000000000);
+    predicates.EqualTo("phone_number", phoneNumber);
     predicates.Or();
-    predicates.EqualTo("phone_numbers", "1470056");
+    predicates.EqualTo("phone_numbers", phoneNumber);
     predicates.Or();
-    predicates.EqualTo("phone_number", "1470089");
+    predicates.EqualTo("phone_number", phoneNumber);
     std::vector<std::string> columns;
     columns.push_back("id");
     columns.push_back("phone_number");
@@ -1406,7 +1427,8 @@ HWTEST_F(VoicemailAbilityTest, voicemail_Update_test_3500, testing::ext::TestSiz
 {
     HILOG_INFO("--- voicemail_Update_test_3500 is starting! ---");
     OHOS::NativeRdb::ValuesBucket values;
-    values.PutString("phone_number", "166323340");
+    std::string phoneNumber = to_string((rand() % (900000000000))+10000000000);
+    values.PutString("phone_number", phoneNumber);
     values.PutInt("voice_status", 1);
     int voicemailId = VoicemailInsertValues(values);
     EXPECT_GT(voicemailId, 0);
@@ -1418,7 +1440,7 @@ HWTEST_F(VoicemailAbilityTest, voicemail_Update_test_3500, testing::ext::TestSiz
     int updateCode = VoicemailUpdate(updateValues, predicates);
     EXPECT_EQ(updateCode, 0);
 
-    updateValues.PutString("phone_number", "166323340");
+    updateValues.PutString("phone_number", phoneNumber);
     predicates.Clear();
     predicates.EqualTo("id", std::to_string(voicemailId));
     std::vector<std::string> columns;
@@ -1444,7 +1466,8 @@ HWTEST_F(VoicemailAbilityTest, voicemail_Query_test_3600, testing::ext::TestSize
 {
     HILOG_INFO("--- voicemail_Query_test_3600 is starting! ---");
     OHOS::NativeRdb::ValuesBucket values;
-    values.PutString("phone_number", "882203110");
+    std::string phoneNumber = to_string((rand() % (900000000000))+10000000000);
+    values.PutString("phone_number", phoneNumber);
     values.PutInt("voice_status", 0);
     int voicemailId = VoicemailInsertValues(values);
     EXPECT_GT(voicemailId, 0);