diff --git a/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/converter/EncryptRuleConfigurationToDistSQLConverter.java b/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/converter/EncryptRuleConfigurationToDistSQLConverter.java
index 35e4bb0e3e58d..e880b0df4f8b4 100644
--- a/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/converter/EncryptRuleConfigurationToDistSQLConverter.java
+++ b/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/converter/EncryptRuleConfigurationToDistSQLConverter.java
@@ -58,14 +58,11 @@ private String convertEncryptColumn(final EncryptColumnRuleConfiguration columnR
     
     private String convertColumns(final EncryptColumnRuleConfiguration columnRuleConfig) {
         StringBuilder result = new StringBuilder();
-        String cipherColumnName = columnRuleConfig.getCipher().getName();
-        result.append(String.format(EncryptConvertDistSQLConstants.CIPHER, cipherColumnName));
-        if (columnRuleConfig.getAssistedQuery().isPresent()) {
-            result.append(DistSQLConstants.COMMA).append(' ').append(String.format(EncryptConvertDistSQLConstants.ASSISTED_QUERY_COLUMN, columnRuleConfig.getAssistedQuery().get().getName()));
-        }
-        if (columnRuleConfig.getLikeQuery().isPresent()) {
-            result.append(DistSQLConstants.COMMA).append(' ').append(String.format(EncryptConvertDistSQLConstants.LIKE_QUERY_COLUMN, columnRuleConfig.getLikeQuery().get().getName()));
-        }
+        result.append(String.format(EncryptConvertDistSQLConstants.CIPHER, columnRuleConfig.getCipher().getName()));
+        columnRuleConfig.getAssistedQuery()
+                .ifPresent(optional -> result.append(DistSQLConstants.COMMA).append(' ').append(String.format(EncryptConvertDistSQLConstants.ASSISTED_QUERY_COLUMN, optional.getName())));
+        columnRuleConfig.getLikeQuery()
+                .ifPresent(optional -> result.append(DistSQLConstants.COMMA).append(' ').append(String.format(EncryptConvertDistSQLConstants.LIKE_QUERY_COLUMN, optional.getName())));
         return result.toString();
     }