diff --git a/frameworks/emitter/ani/ets/@ohos.events.emitter.ets b/frameworks/emitter/ani/ets/@ohos.events.emitter.ets
index 9ab3a71096e2d55cbc2a1dfea9a0bebf7049b78c..6a6b5cceaa2f3c247e453db3ede0e2a0865fa0cc 100644
--- a/frameworks/emitter/ani/ets/@ohos.events.emitter.ets
+++ b/frameworks/emitter/ani/ets/@ohos.events.emitter.ets
@@ -79,45 +79,36 @@ namespace emitter {
   export native function EmitStringOptionsSync(eventId:string, options: Options): void;
 
   export function on(event: InnerEvent, callback: Callback<EventData>): void {
-    if (event == null || callback == null) {
-      return;
-    }
     if (event.eventId) {
       OnOrOnceSync(event.eventId, false, callback, "eventData");
     }
   }
 
-  export function once(event: InnerEvent, callback: Callback<EventData>): void {
-    if (event == null || callback == null) {
+  export function on<T>(eventId: string, callback: Callback<EventData> | Callback<GenericEventData<T>>): void {
+    if (eventId === '') {
       return;
     }
-    if (event.eventId) {
-      OnOrOnceSync(event.eventId, true, callback, "eventData");
+    if (callback instanceof Callback<EventData>) {
+      OnOrOnceStringSync(eventId, false, callback as Callback<EventData>, "eventData");
+    } else {
+      OnOrOnceGenericEventSync(eventId, false, callback as Callback<GenericEventData<T>>, "genericEventData");
     }
   }
 
-  export function once(eventId: string, callback: Callback<EventData>): void {
-    if (eventId === '' || callback == null) {
-      return;
+  export function once(event: InnerEvent, callback: Callback<EventData>): void {
+    if (event.eventId) {
+      OnOrOnceSync(event.eventId, true, callback, "eventData");
     }
-    OnOrOnceStringSync(eventId, true, callback, "eventData");
   }
 
-  export function off(eventId: string): void {
+  export function once<T>(eventId: string, callback: Callback<EventData>|Callback<GenericEventData<T>>): void {
     if (eventId === '') {
       return;
     }
-    OffStringIdSync(eventId);
-  }
-
-  export function off<T>(eventId: string, callback: Callback<EventData> | Callback<GenericEventData<T>>): void {
-    if (eventId === '' || callback == null) {
-      return;
-    }
     if (callback instanceof Callback<EventData>) {
-      OffStringSync(eventId, callback as Callback<EventData>);
+      OnOrOnceStringSync(eventId, true, callback as Callback<EventData>, "eventData");
     } else {
-      OffGenericEventSync(eventId, callback as Callback<GenericEventData<T>>);
+      OnOrOnceGenericEventSync(eventId, true, callback as Callback<GenericEventData<T>>, "genericEventData");
     }
   }
 
@@ -125,6 +116,13 @@ namespace emitter {
     OffNumberSync(eventId);
   }
 
+  export function off(eventId: string): void {
+    if (eventId === '') {
+      return;
+    }
+    OffStringIdSync(eventId);
+  }
+
   export function off(eventId: number, callback: Callback<EventData>): void {
     if (callback == null) {
       return;
@@ -132,69 +130,69 @@ namespace emitter {
     OffNumberCallbackSync(eventId, callback);
   }
 
-  export function on<T>(eventId: string, callback: Callback<EventData> | Callback<GenericEventData<T>>): void {
-    if (eventId === '' || callback == null) {
+  export function off<T>(eventId: string, callback: Callback<EventData> | Callback<GenericEventData<T>>): void {
+    if (eventId === '') {
       return;
     }
     if (callback instanceof Callback<EventData>) {
-      OnOrOnceStringSync(eventId, false, callback as Callback<EventData>, "eventData");
+      OffStringSync(eventId, callback as Callback<EventData>);
     } else {
-      OnOrOnceGenericEventSync(eventId, false, callback as Callback<GenericEventData<T>>, "genericEventData");
+      OffGenericEventSync(eventId, callback as Callback<GenericEventData<T>>);
     }
   }
 
-  export function emit(eventId: string, options: Options, data?: EventData): void {
-    if (eventId === '' || options == null) {
+export function emit(event: InnerEvent, data?: EventData): void {
+    if (event == null) {
       return;
     }
     if (data != undefined) {
-      EmitStringOptionsDataSync(eventId, options, data as EventData);
+      EmitInnerEventDataSync(event, data);
     } else {
-      EmitStringOptionsSync(eventId, options);
+      EmitInnerEventSync(event);
     }
   }
 
-  export function emit<T>(eventId: string, options: Options, data?: GenericEventData<T>): void {
-    if (eventId === '' || options == null) {
+  export function emit(eventId: string, data?: EventData): void {
+    if (eventId === '') {
       return;
     }
     if (data != undefined) {
-      EmitStringOptionsGenericSync(eventId, options, data as GenericEventData<T>);
+      EmitStringDataSync(eventId, data as EventData);
     } else {
-      EmitStringOptionsSync(eventId, options);
+      EmitStringSync(eventId);
     }
   }
 
-  export function emit(eventId: string, data?: EventData): void {
+  export function emit<T>(eventId: string, data?: GenericEventData<T>): void {
     if (eventId === '') {
       return;
     }
     if (data != undefined) {
-      EmitStringDataSync(eventId, data as EventData);
+      EmitStringGenericSync(eventId, data as GenericEventData<T>);
     } else {
       EmitStringSync(eventId);
     }
   }
 
-  export function emit<T>(eventId: string, data?: GenericEventData<T>): void {
+  export function emit(eventId: string, options: Options, data?: EventData): void {
     if (eventId === '') {
       return;
     }
     if (data != undefined) {
-      EmitStringGenericSync(eventId, data as GenericEventData<T>);
+      EmitStringOptionsDataSync(eventId, options, data as EventData);
     } else {
-      EmitStringSync(eventId);
+      EmitStringOptionsSync(eventId, options);
     }
   }
 
-  export function emit(event: InnerEvent, data?: EventData): void {
-    if (event == null) {
+  export function emit<T>(eventId: string, options: Options, data?: GenericEventData<T>): void {
+    if (eventId === '') {
       return;
     }
     if (data != undefined) {
-      EmitInnerEventDataSync(event, data);
+      EmitStringOptionsGenericSync(eventId, options, data as GenericEventData<T>);
     } else {
-      EmitInnerEventSync(event);
+      EmitStringOptionsSync(eventId, options);
     }
   }
 
@@ -211,4 +209,4 @@ namespace emitter {
     return count;
   }
 }
-export default emitter;
\ No newline at end of file
+export default emitter;