diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewPbomParentMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewPbomParentMapper.xml
index 8b82b6bb..cdf767fd 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewPbomParentMapper.xml
+++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewPbomParentMapper.xml
@@ -121,7 +121,7 @@
             and fac_code = #{query.facCode}
         </if>
         <if test="query.materialNo!= null and query.materialNo!=''">
-            and material_no = #{query.materialNo}
+            and a.material_no = #{query.materialNo}
         </if>
         <if test="query.drawingNo!= null and query.drawingNo!=''">
             and drawing_no = #{query.drawingNo}
diff --git a/nflg_project_dev/nflg-boot-base/nflg-boot-core/src/main/java/com/nflg/product/base/core/config/MybatisPlusHandler.java b/nflg_project_dev/nflg-boot-base/nflg-boot-core/src/main/java/com/nflg/product/base/core/config/MybatisPlusHandler.java
index c7c3cc42..d07cb7fb 100644
--- a/nflg_project_dev/nflg-boot-base/nflg-boot-core/src/main/java/com/nflg/product/base/core/config/MybatisPlusHandler.java
+++ b/nflg_project_dev/nflg-boot-base/nflg-boot-core/src/main/java/com/nflg/product/base/core/config/MybatisPlusHandler.java
@@ -3,6 +3,7 @@ package com.nflg.product.base.core.config;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
 import com.nflg.product.base.core.conmon.util.SessionUtil;
+import com.nflg.product.base.core.exception.NflgBusinessException;
 import org.apache.ibatis.reflection.MetaObject;
 import org.springframework.stereotype.Component;
 
@@ -17,16 +18,24 @@ import java.time.LocalDateTime;
 public class MybatisPlusHandler implements MetaObjectHandler {
     @Override
     public void insertFill(MetaObject metaObject) {
-        this.strictInsertFill(metaObject, "createdBy", String.class, SessionUtil.getUserName());
+        this.strictInsertFill(metaObject, "createdBy", String.class, getUserName());
         this.strictInsertFill(metaObject, "createdTime", LocalDateTime.class, LocalDateTime.now());
-        this.strictInsertFill(metaObject, "updatedBy", String.class, StrUtil.isNotBlank(SessionUtil.getRealName())?SessionUtil.getRealName() :SessionUtil.getUserName());
+        this.strictInsertFill(metaObject, "updatedBy", String.class, getUserName());
         this.strictInsertFill(metaObject, "updatedTime", LocalDateTime.class, LocalDateTime.now());
 
     }
 
     @Override
     public void updateFill(MetaObject metaObject) {
-        this.strictInsertFill(metaObject, "updatedBy", String.class,  StrUtil.isNotBlank(SessionUtil.getRealName())?SessionUtil.getRealName() :SessionUtil.getUserName());
+        this.strictInsertFill(metaObject, "updatedBy", String.class, getUserName());
         this.strictInsertFill(metaObject, "updatedTime", LocalDateTime.class, LocalDateTime.now());
     }
+
+    private String getUserName() {
+        try {
+            return StrUtil.isNotBlank(SessionUtil.getRealName()) ? SessionUtil.getRealName() : SessionUtil.getUserName();
+        } catch (NflgBusinessException e) {
+            return "admin";
+        }
+    }
 }