diff --git a/src/main/java/cn/lihongjie/coal/mapper/CommonMapper.java b/src/main/java/cn/lihongjie/coal/mapper/CommonMapper.java
index 57a2159a..8b5ea655 100644
--- a/src/main/java/cn/lihongjie/coal/mapper/CommonMapper.java
+++ b/src/main/java/cn/lihongjie/coal/mapper/CommonMapper.java
@@ -1,6 +1,7 @@
 package cn.lihongjie.coal.mapper;
 
 import cn.lihongjie.coal.entity.*;
+import org.apache.commons.lang3.StringUtils;
 import org.mapstruct.Mapper;
 
 @Mapper(componentModel = "spring")
@@ -8,6 +9,9 @@ public interface CommonMapper {
 
     public default UserEntity createUser(String id) {
 
+        if (StringUtils.isEmpty(id)) {
+            return null;
+        }
         UserEntity user = new UserEntity();
 
         user.setId(id);
@@ -18,6 +22,9 @@ public interface CommonMapper {
 
     public default DictionaryEntity createDictionary(String id) {
 
+        if (StringUtils.isEmpty(id)) {
+            return null;
+        }
         DictionaryEntity e = new DictionaryEntity();
         e.setId(id);
         return e;
@@ -26,6 +33,9 @@ public interface CommonMapper {
 
     public default DictionaryItemEntity createDictionaryItem(String id) {
 
+        if (StringUtils.isEmpty(id)) {
+            return null;
+        }
         DictionaryItemEntity e = new DictionaryItemEntity();
         e.setId(id);
         return e;
@@ -34,6 +44,9 @@ public interface CommonMapper {
 
     public default SysLogEntity createOperat(String id) {
 
+        if (StringUtils.isEmpty(id)) {
+            return null;
+        }
         SysLogEntity e = new SysLogEntity();
         e.setId(id);
         return e;
@@ -42,6 +55,9 @@ public interface CommonMapper {
 
     public default OrganizationEntity createOrganization(String id) {
 
+        if (StringUtils.isEmpty(id)) {
+            return null;
+        }
         OrganizationEntity e = new OrganizationEntity();
         e.setId(id);
         return e;
@@ -50,6 +66,9 @@ public interface CommonMapper {
 
     public default PermissionEntity createPermission(String id) {
 
+        if (StringUtils.isEmpty(id)) {
+            return null;
+        }
         PermissionEntity e = new PermissionEntity();
         e.setId(id);
         return e;
@@ -58,6 +77,9 @@ public interface CommonMapper {
 
     public default ResourceEntity createResource(String id) {
 
+        if (StringUtils.isEmpty(id)) {
+            return null;
+        }
         ResourceEntity e = new ResourceEntity();
         e.setId(id);
         return e;
@@ -66,6 +88,10 @@ public interface CommonMapper {
 
     public default RoleEntity createRole(String id) {
 
+        if (StringUtils.isEmpty(id)) {
+
+            return null;
+        }
         RoleEntity e = new RoleEntity();
         e.setId(id);
         return e;