diff --git a/OAT.xml b/OAT.xml
index aa01ceabe357535c840cb743727fb16106185a8e..78d6121297f7b5a729a2ab4ad3ee2a1e44b7aa81 100644
--- a/OAT.xml
+++ b/OAT.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- 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.
@@ -13,8 +13,6 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 
-     Notes:
-     This is project config file for OpenHarmony OSS Audit Tool, if you have any questions or concerns, please email chenyaxun@huawei.com.
 -->
 <!-- OAT(OSS Audit Tool) configuration guide:
 basedir: Root dir, the basedir + project path is the real source file location.
diff --git a/frameworks/ans/core/common/src/ans_log_wrapper.cpp b/frameworks/ans/core/common/src/ans_log_wrapper.cpp
index dc568d4005ac30066cdc6317981af881c4d78b0e..417eab5d6c4c79a52074a7a1d19ef7a5457c34c7 100644
--- a/frameworks/ans/core/common/src/ans_log_wrapper.cpp
+++ b/frameworks/ans/core/common/src/ans_log_wrapper.cpp
@@ -21,10 +21,7 @@ AnsLogLevel AnsLogWrapper::level_ = {AnsLogLevel::DEBUG};
 bool AnsLogWrapper::JudgeLevel(const AnsLogLevel &level)
 {
     const AnsLogLevel &curLevel = AnsLogWrapper::GetLogLevel();
-    if (level < curLevel) {
-        return false;
-    }
-    return true;
+    return (level >= curLevel);
 }
 
 std::string AnsLogWrapper::GetBriefFileName(const char *str)
diff --git a/frameworks/ans/core/src/ans_manager_death_recipient.cpp b/frameworks/ans/core/src/ans_manager_death_recipient.cpp
index 07d648bff5a011b18e60cb9ede2607746afb1c65..eaf6498b41cb681b0a28e33d34801c8c461e5ff6 100644
--- a/frameworks/ans/core/src/ans_manager_death_recipient.cpp
+++ b/frameworks/ans/core/src/ans_manager_death_recipient.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
diff --git a/frameworks/ans/dialog/dialog_ui/js/pages/index/index.css b/frameworks/ans/dialog/dialog_ui/js/pages/index/index.css
index 7afe50dcd4bab9a60f6f5c77b691ed2f200d5cca..950ed5b6749fecd15bfcec5a1476af88c4099e3a 100644
--- a/frameworks/ans/dialog/dialog_ui/js/pages/index/index.css
+++ b/frameworks/ans/dialog/dialog_ui/js/pages/index/index.css
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 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/frameworks/ans/dialog/dialog_ui/js/pages/index/index.hml b/frameworks/ans/dialog/dialog_ui/js/pages/index/index.hml
index 73e8c517ae776509ae3d4a2cb803c5b6acb6fd52..e1ec0ff57ae11030240547b5b017c7b36bd17fd7 100644
--- a/frameworks/ans/dialog/dialog_ui/js/pages/index/index.hml
+++ b/frameworks/ans/dialog/dialog_ui/js/pages/index/index.hml
@@ -1,5 +1,5 @@
 <!--  
-    Copyright (c) 2022 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/frameworks/ans/native/src/notification_user_input.cpp b/frameworks/ans/native/src/notification_user_input.cpp
index 337eeb50cdd3e8f5d4c2cf6057604474984a85ca..dfd11abb96cc01e8179612b7ef5cacdf12ae485a 100644
--- a/frameworks/ans/native/src/notification_user_input.cpp
+++ b/frameworks/ans/native/src/notification_user_input.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
@@ -248,7 +248,7 @@ bool NotificationUserInput::ToJson(nlohmann::json &jsonObject) const
 
 NotificationUserInput *NotificationUserInput::FromJson(const nlohmann::json &jsonObject)
 {
-    if (jsonObject.is_null() or !jsonObject.is_object()) {
+    if (jsonObject.is_null() || !jsonObject.is_object()) {
         ANS_LOGE("Invalid JSON object");
         return nullptr;
     }
diff --git a/frameworks/ans/test/moduletest/ans_fw_module_test.cpp b/frameworks/ans/test/moduletest/ans_fw_module_test.cpp
index e5fec4ec012c82b7df8eff17d3e04206cdaabbb3..e6763424dbb05b7cc00bfb0d7faa15839f19b9b9 100644
--- a/frameworks/ans/test/moduletest/ans_fw_module_test.cpp
+++ b/frameworks/ans/test/moduletest/ans_fw_module_test.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
@@ -444,9 +444,11 @@ public:
         DistributedKv::StoreId storeId = {.storeId = KVSTORE_SCREEN_STATUS_STORE_ID};
         std::shared_ptr<DistributedKv::AnsTestSingleKvStore> pointer =
             DistributedKv::AnsTestSingleKvStore::GetMockKvStorePointer(appId, storeId);
-        DistributedKv::Key key("<remoteDeviceId>" + DELIMITER + "screen_status");
-        DistributedKv::Value value(isScreenOn ? "on" : "off");
-        pointer->Put(key, value);
+        if (pointer) {
+            DistributedKv::Key key("<remoteDeviceId>" + DELIMITER + "screen_status");
+            DistributedKv::Value value(isScreenOn ? "on" : "off");
+            pointer->Put(key, value);
+        }
     }
 };
 
diff --git a/interfaces/kits/napi/ans/src/reminder/reminder_common.cpp b/interfaces/kits/napi/ans/src/reminder/reminder_common.cpp
index 5f4ada3ae34a614869eb0cbb6739929788484d16..746a31c4f8d380fe4031635468b78716d2ea79e2 100644
--- a/interfaces/kits/napi/ans/src/reminder/reminder_common.cpp
+++ b/interfaces/kits/napi/ans/src/reminder/reminder_common.cpp
@@ -461,7 +461,7 @@ bool ReminderCommon::CheckCalendarParams(const int32_t &year, const int32_t &mon
             ReminderAgentNapi::CALENDAR_YEAR, UINT16_MAX);
         return false;
     }
-    if ((month < 1) || (month > (ReminderRequestCalendar::MAX_MONTHS_OF_YEAR))) {
+    if ((month < 1) || (month > ReminderRequestCalendar::MAX_MONTHS_OF_YEAR)) {
         ANSR_LOGW("Create calendar reminder fail: designated %{public}s must between [1, %{public}hhu]",
             ReminderAgentNapi::CALENDAR_MONTH, ReminderRequestCalendar::MAX_MONTHS_OF_YEAR);
         return false;
diff --git a/services/ans/src/bundle_manager_helper.cpp b/services/ans/src/bundle_manager_helper.cpp
index 9e965edcb73798f9fe07f06e0f98ee0b2983315e..fa16f96a1d1f9488fc21c3acb82c6eaae7b39c79 100644
--- a/services/ans/src/bundle_manager_helper.cpp
+++ b/services/ans/src/bundle_manager_helper.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
diff --git a/services/ans/src/notification_preferences_info.cpp b/services/ans/src/notification_preferences_info.cpp
index 6d8e53d3b3eae14242ff47139382817c4df6db11..ce0708be9f29d93d4578f9c24b4bd34f0876ea55 100644
--- a/services/ans/src/notification_preferences_info.cpp
+++ b/services/ans/src/notification_preferences_info.cpp
@@ -152,7 +152,9 @@ bool NotificationPreferencesInfo::BundleInfo::GetAllSlotsInGroup(
 
 void NotificationPreferencesInfo::BundleInfo::SetGroup(const sptr<NotificationSlotGroup> &group)
 {
-    groups_.insert_or_assign(group->GetId(), group);
+    if (group) {
+        groups_.insert_or_assign(group->GetId(), group);
+    }
 }
 
 bool NotificationPreferencesInfo::BundleInfo::GetGroup(const std::string &groupId, sptr<NotificationSlotGroup> &group)
diff --git a/services/ans/src/notification_subscriber_manager.cpp b/services/ans/src/notification_subscriber_manager.cpp
index 76868a8c12570167a4c61dfb5f253a8b966a6e25..c5bfe04469027943fc7abe77bd507b97d11c63e2 100644
--- a/services/ans/src/notification_subscriber_manager.cpp
+++ b/services/ans/src/notification_subscriber_manager.cpp
@@ -77,7 +77,7 @@ ErrCode NotificationSubscriberManager::AddSubscriber(
         ANS_LOGD("Get userId successed, callingUid = <%{public}d> userId = <%{public}d>", callingUid, userId);
         subInfo->AddAppUserId(userId);
     }
-
+    
     ErrCode result = ERR_ANS_TASK_ERR;
     handler_->PostSyncTask(std::bind([this, &subscriber, &subInfo, &result]() {
         result = this->AddSubscriberInner(subscriber, subInfo);
diff --git a/services/distributed/src/distributed_preferences.cpp b/services/distributed/src/distributed_preferences.cpp
index 551fb0f1c605aa46f6326d96574c9e2f511a6f46..76564a1e2355a2196cbecaee805bdd7cb5aa3085 100644
--- a/services/distributed/src/distributed_preferences.cpp
+++ b/services/distributed/src/distributed_preferences.cpp
@@ -78,8 +78,10 @@ void DistributedPreferences::GetDistributedMainKey(std::string &key)
 void DistributedPreferences::GetDistributedBundleKey(
     const sptr<NotificationBundleOption> &bundleOption, std::string &key)
 {
-    key = DISTRIBUTED_LABEL + DELIMITER + BUNDLE_LABEL + DELIMITER + bundleOption->GetBundleName() + DELIMITER +
-          std::to_string(bundleOption->GetUid());
+    if (bundleOption) {
+        key = DISTRIBUTED_LABEL + DELIMITER + BUNDLE_LABEL + DELIMITER + bundleOption->GetBundleName() + DELIMITER +
+            std::to_string(bundleOption->GetUid());
+    }
 }
 
 bool DistributedPreferences::ResolveDistributedKey(const std::string &key, ResolveKey &resolveKey)
diff --git a/services/distributed/test/unittest/BUILD.gn b/services/distributed/test/unittest/BUILD.gn
index 0f1d53cc65c033da104261258efe0263a97a316a..a44b608eab54e1c6cd078c3f563a7b8af8a7c687 100644
--- a/services/distributed/test/unittest/BUILD.gn
+++ b/services/distributed/test/unittest/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/test/resource/notificationfuzztest/src/notificationgetparam.cpp b/test/resource/notificationfuzztest/src/notificationgetparam.cpp
index 99c54eae6e13fee5d0b66cad511cdfff6ac7c7ae..0006499c147fb26971c7663ea232438427c97f2a 100644
--- a/test/resource/notificationfuzztest/src/notificationgetparam.cpp
+++ b/test/resource/notificationfuzztest/src/notificationgetparam.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
@@ -971,16 +971,12 @@ OHOS::Notification::NotificationConstant::SubscribeResult GetParamSubscribeResul
     switch (GetIntParam() % INDEX_THREE) {
         case INDEX_ZERO:
             return OHOS::Notification::NotificationConstant::SubscribeResult::SUCCESS;
-            break;
         case INDEX_ONE:
             return OHOS::Notification::NotificationConstant::SubscribeResult::PREMISSION_FAIL;
-            break;
         case INDEX_TWO:
             return OHOS::Notification::NotificationConstant::SubscribeResult::RESOURCES_FAIL;
-            break;
         default:
             return OHOS::Notification::NotificationConstant::SubscribeResult::SUCCESS;
-            break;
     }
 }
 
@@ -1005,16 +1001,12 @@ std::shared_ptr<OHOS::AppExecFwk::BaseTaskDispatcher> GetParamBaseTaskDispatcher
     switch (GetIntParam() % INDEX_THREE) {
         case INDEX_ZERO:
             return context->CreateSerialDispatcher(GetStringParam(), GetParamTaskPriority());
-            break;
         case INDEX_ONE:
             return context->CreateParallelDispatcher(GetStringParam(), GetParamTaskPriority());
-            break;
         case INDEX_TWO:
             return specTaskDispatcher;
-            break;
         default:
             return context->CreateSerialDispatcher(GetStringParam(), GetParamTaskPriority());
-            break;
     }
 }
 
diff --git a/tools/dump/src/notification_shell_command.cpp b/tools/dump/src/notification_shell_command.cpp
index 97de8dd95d8b5da05f66b0ac7be1481c1e99cda2..09e1fafdf2c1a4e992cb52533b1147d8d0bbe9be 100644
--- a/tools/dump/src/notification_shell_command.cpp
+++ b/tools/dump/src/notification_shell_command.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