diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itembasic/ItembasicServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itembasic/ItembasicServiceImpl.java
index 60432365..5a0fe3c3 100644
--- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itembasic/ItembasicServiceImpl.java
+++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itembasic/ItembasicServiceImpl.java
@@ -1,4 +1,5 @@
 package com.win.module.wms.service.itembasic;
+
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -14,12 +15,14 @@ import com.win.module.wms.convert.itembasic.ItembasicConvert;
 import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
 import com.win.module.wms.dal.mysql.itembasic.ItembasicMapper;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import org.springframework.validation.annotation.Validated;
+
 import javax.annotation.Resource;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.List;
+
 import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static com.win.module.wms.enums.ErrorCodeConstants.*;
 
@@ -38,6 +41,7 @@ public class ItembasicServiceImpl implements ItembasicService {
     private TrendsApi trendsApi;
 
     @Override
+    @Transactional
     public Long createItembasic(ItembasicCreateReqVO createReqVO) {
         validateItembasicForCreateOrUpdate(createReqVO.getId(),createReqVO.getCode(),createReqVO.getStatus(),createReqVO.getUom(),createReqVO.getIsStdPack(),createReqVO.getEnableBuy()
                 ,createReqVO.getEnableMake(),createReqVO.getEnableOutsourcing(),createReqVO.getIsRecycled(),createReqVO.getIsPhantom(),createReqVO.getAbcClass(),createReqVO.getType()
@@ -108,7 +112,8 @@ public class ItembasicServiceImpl implements ItembasicService {
         return itembasicMapper.selectList(exportReqVO);
     }
 
-    public List<ItembasicImportExcelVo>  importItembasicList(List<ItembasicImportExcelVo> importItembasics, Integer mode, boolean updatePart) {
+    @Transactional
+    public List<ItembasicImportExcelVo> importItembasicList(List<ItembasicImportExcelVo> importItembasics, Integer mode, boolean updatePart) {
         if (CollUtil.isEmpty(importItembasics)) {
             throw exception(ITEMBASIC_IMPORT_LIST_IS_EMPTY);
         }
diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/location/LocationServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/location/LocationServiceImpl.java
index 88808fc2..f0b7736f 100644
--- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/location/LocationServiceImpl.java
+++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/location/LocationServiceImpl.java
@@ -314,16 +314,16 @@ public class LocationServiceImpl implements LocationService {
         locationTypeList.add("SEMI");
         locationTypeList.add("FG");
         queryWrapper.in("`type`", locationTypeList);
-        Object warehouseCode = jsonObject.get("WarehouseCode");
-        if(warehouseCode != null) {
+        Object warehouseCode = String.valueOf(jsonObject.get("WarehouseCode"));
+        if(!warehouseCode.equals("")) {
             queryWrapper.eq("warehouse_code", warehouseCode);
         }
         Object areaCode = jsonObject.get("AreaCode");
-        if(areaCode != null) {
+        if(!areaCode.equals("")) {
             queryWrapper.eq("area_code", areaCode);
         }
-        Object locationGroupCode = jsonObject.get("LocationGroupCode");
-        if(locationGroupCode != null) {
+        Object locationGroupCode = String.valueOf(jsonObject.get("LocationGroupCode"));
+        if(!locationGroupCode.equals("")) {
             queryWrapper.eq("location_group_code", locationGroupCode);
         }
         String emptyLocationFirst = String.valueOf(jsonObject.get("EmptyLocationFirst"));