diff --git a/src/main/java/com/zhgd/jeecg/common/system/query/QueryGenerator.java b/src/main/java/com/zhgd/jeecg/common/system/query/QueryGenerator.java
index fe8fdf651..d7619db14 100644
--- a/src/main/java/com/zhgd/jeecg/common/system/query/QueryGenerator.java
+++ b/src/main/java/com/zhgd/jeecg/common/system/query/QueryGenerator.java
@@ -214,7 +214,7 @@ public class QueryGenerator {
         if (parameterMap != null && parameterMap.containsKey(ORDER_TYPE)) {
             order = parameterMap.get(ORDER_TYPE)[0];
         }
-        log.info("排序规则>>列:" + column + ",排序方式:" + order);
+        //log.info("排序规则>>列:" + column + ",排序方式:" + order);
         if (oConvertUtils.isNotEmpty(column) && oConvertUtils.isNotEmpty(order)) {
             String c = oConvertUtils.camelToUnderline(column);
             String aliasField = alias != null ? alias + c : c;
@@ -421,7 +421,7 @@ public class QueryGenerator {
         long start = System.currentTimeMillis();
         QueryWrapper<T> queryWrapper = new QueryWrapper<T>();
         installMplus(queryWrapper, JSONObject.parseObject(JSONObject.toJSONString(map), clz), initParamMap(map), excludeFields, likeFields, defaultAlias);
-        log.info("---查询条件构造器初始化完成,耗时:" + (System.currentTimeMillis() - start) + "毫秒----");
+        //log.info("---查询条件构造器初始化完成,耗时:" + (System.currentTimeMillis() - start) + "毫秒----");
         return queryWrapper;
     }
 
@@ -609,7 +609,7 @@ public class QueryGenerator {
             return;
         }
         name = oConvertUtils.camelToUnderline(name);
-        log.info("--查询规则-->" + name + " " + rule.getValue() + " " + value);
+        //log.info("--查询规则-->" + name + " " + rule.getValue() + " " + value);
         if (org.apache.commons.lang3.StringUtils.isNotBlank(alias)) {
             name = alias + name;
         }
diff --git a/src/main/java/com/zhgd/xmgl/config/AsyncConfig.java b/src/main/java/com/zhgd/xmgl/config/AsyncConfig.java
index 80e45338c..2c407409d 100644
--- a/src/main/java/com/zhgd/xmgl/config/AsyncConfig.java
+++ b/src/main/java/com/zhgd/xmgl/config/AsyncConfig.java
@@ -7,6 +7,7 @@ import org.springframework.context.annotation.Primary;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import org.springframework.security.core.context.SecurityContextHolder;
 
+import javax.annotation.PostConstruct;
 import java.util.concurrent.ThreadPoolExecutor;
 
 /**
@@ -30,9 +31,9 @@ public class AsyncConfig {
      */
     private int queueCapacity = 200;
 
-    @Bean
-    public InitializingBean initializingBean() {
-        return () -> SecurityContextHolder.setStrategyName(SecurityContextHolder.MODE_INHERITABLETHREADLOCAL);
+    @PostConstruct
+    public void init() {
+        SecurityContextHolder.setStrategyName(SecurityContextHolder.MODE_INHERITABLETHREADLOCAL);
     }
 
     /**
diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/emergency/service/impl/XzEmergencyRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/xz/emergency/service/impl/XzEmergencyRecordServiceImpl.java
index 721f081ad..0ef38d2be 100644
--- a/src/main/java/com/zhgd/xmgl/modules/xz/emergency/service/impl/XzEmergencyRecordServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/xz/emergency/service/impl/XzEmergencyRecordServiceImpl.java
@@ -123,12 +123,14 @@ public class XzEmergencyRecordServiceImpl extends ServiceImpl<XzEmergencyRecordM
         baseMapper.updateById(xzEmergencyRecord);
         xzEmergencyRescueSituationMapper.delete(new LambdaQueryWrapper<XzEmergencyRescueSituation>()
                 .eq(XzEmergencyRescueSituation::getXzEmergencyRecordId, xzEmergencyRecord.getId()));
-        for (XzEmergencyRescueSituation situation : xzEmergencyRecord.getSituations()) {
-            situation.setId(null);
-            situation.setXzEmergencyRecordId(xzEmergencyRecord.getId());
-            situation.setProjectSn(xzEmergencyRecord.getProjectSn());
-            situation.setDisposalPersonId(SecurityUtils.getUser().getUserId());
-            xzEmergencyRescueSituationMapper.insert(situation);
+        if (xzEmergencyRecord.getSituations() != null) {
+            for (XzEmergencyRescueSituation situation : xzEmergencyRecord.getSituations()) {
+                situation.setId(null);
+                situation.setXzEmergencyRecordId(xzEmergencyRecord.getId());
+                situation.setProjectSn(xzEmergencyRecord.getProjectSn());
+                situation.setDisposalPersonId(SecurityUtils.getUser().getUserId());
+                xzEmergencyRescueSituationMapper.insert(situation);
+            }
         }
     }