diff --git a/iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/system/SystemTalkAnswerConfigService.java b/iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/system/SystemTalkAnswerConfigService.java
index a1d1522..7f0f00b 100644
--- a/iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/system/SystemTalkAnswerConfigService.java
+++ b/iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/system/SystemTalkAnswerConfigService.java
@@ -82,7 +82,7 @@ public class SystemTalkAnswerConfigService extends GenericReactiveCrudService<Sy
 				ReactiveQuery<SystemTalkAnswerConfigEntity> reactiveQuery1 = createQuery();
 				reactiveQuery1 = reactiveQuery1.and("is_delete", 0);
 				reactiveQuery1 = reactiveQuery1.and("parent_id", item.getId());
-				reactiveQuery1 = reactiveQuery1.gt("answer_type", AskTypeEnum.EXCOMMAND.getCode());
+				reactiveQuery1 = reactiveQuery1.gte("answer_type", AskTypeEnum.EXCOMMAND.getCode());
 				reactiveQuery1.paging(0, MAX_COUT.intValue()).fetch().map(item1 ->{
 					item1.setAnswerType(item1.getAnswerType() % systemTalkAnswerConfig.getSystemTalkAnswerConfig().getAnswerType());
 					systemTalkAnswerConfig.getExCommand().put(item1.getAskKey(), item1);
diff --git a/iot-common/iot-third/src/main/java/com/qiuguo/iot/third/enums/ActionPartSpeechEnum.java b/iot-common/iot-third/src/main/java/com/qiuguo/iot/third/enums/ActionPartSpeechEnum.java
index 686a122..c29fa01 100644
--- a/iot-common/iot-third/src/main/java/com/qiuguo/iot/third/enums/ActionPartSpeechEnum.java
+++ b/iot-common/iot-third/src/main/java/com/qiuguo/iot/third/enums/ActionPartSpeechEnum.java
@@ -857,18 +857,25 @@ public enum ActionPartSpeechEnum implements IChinesePartSpeech{
             if(entity.getExCommand() == null){
                 return entity.getSystemTalkAnswerConfig();
             }else{
-                //找到扩展指令
-                for (String key1 :entity.getKeys()){
-                    if(ask.toLowerCase().contains(key1)){
-                        return entity.getExCommand().get(key1);
-                    }
-                }
-                //找不到继续用原来的
-                return entity.getSystemTalkAnswerConfig();
+                return getSystemTalkWithKey(entity, ask);
             }
-            //return keyGroup.get(key);
         }
         return null;
     }
+
+    private static SystemTalkAnswerConfigEntity getSystemTalkWithKey(SystemTalkAnswerConfig systemTalkAnswerConfig,
+                                                String ask){
+        if(systemTalkAnswerConfig.getExCommand() != null){
+            //找到扩展指令
+            for (String key1 :systemTalkAnswerConfig.getKeys()){
+                if(ask.toLowerCase().contains(key1)){
+                    return systemTalkAnswerConfig.getExCommand().get(key1);
+                }
+            }
+            //找不到继续用原来的
+            return systemTalkAnswerConfig.getSystemTalkAnswerConfig();
+        }
+        return systemTalkAnswerConfig.getSystemTalkAnswerConfig();
+    }
     
 }