diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataStoreBrandController.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataStoreBrandController.java
index 7ce275cc8..b64ce4219 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataStoreBrandController.java
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataStoreBrandController.java
@@ -18,6 +18,7 @@ package com.logpm.basicdata.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.logpm.basicdata.entity.BasicdataStoreBrandEntity;
 import com.logpm.basicdata.excel.BasicdataStoreBrandExcel;
@@ -75,7 +76,13 @@ public class BasicdataStoreBrandController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入basicdataStoreBrand")
 	public R<IPage<BasicdataStoreBrandEntity>> list(@ApiIgnore @RequestParam Map<String, Object> basicdataStoreBrand, Query query) {
-		IPage<BasicdataStoreBrandEntity> pages = basicdataStoreBrandService.page(Condition.getPage(query), Condition.getQueryWrapper(basicdataStoreBrand, BasicdataStoreBrandEntity.class));
+		Object o = basicdataStoreBrand.get("shopId");
+		if(ObjectUtils.isNotNull(o)){
+			basicdataStoreBrand.put("shopId",null);
+		}
+		QueryWrapper<BasicdataStoreBrandEntity> queryWrapper = Condition.getQueryWrapper(basicdataStoreBrand, BasicdataStoreBrandEntity.class);
+		queryWrapper.eq(ObjectUtils.isNotNull(o),"shop_id",o);
+		IPage<BasicdataStoreBrandEntity> pages = basicdataStoreBrandService.page(Condition.getPage(query),queryWrapper);
 		return R.data(pages);
 	}
 	/**
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseTaskApiController.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseTaskApiController.java
index 6f21caec5..972e2ef7d 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseTaskApiController.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseTaskApiController.java
@@ -122,6 +122,9 @@ public class WarehouseTaskApiController {
 			if(ObjectUtils.isNull(taskSearchDTO.getTaskId())){
 				return R.fail("盘点任务id不能为空");
 			}
+			if(ObjectUtils.isNull(taskSearchDTO.getTrayId())){
+				return R.fail("盘点托盘id不能为空");
+			}
 			R r= taskQuestService.trayListInfo(Condition.getPage(query), taskSearchDTO);
 			return r;
 		}else{
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java
index c81bf0153..3b4fd21ba 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java
@@ -280,15 +280,19 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 		BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
 		verifyTask(taskSearchDTO.getTaskId(),myCurrentWarehouse.getId());
 
-		//查询托盘编码
-		BasicdataTrayEntity trayByTrayCode = basicdataTrayClient.getTrayByTrayCode(taskSearchDTO.getTrayCode());
-		Optional<BasicdataTrayEntity> trayByTrayCode1 = Optional.ofNullable(trayByTrayCode);
-		if(!trayByTrayCode1.isPresent()){
-			Resp.scanFail("托盘码不存在！","托盘码不存在！");
-		}
+
 		List<Long> collect =this.getmyWarehouseList();
 		baseMapper.setSqlMode();
 		if(ObjectUtils.isNotNull(taskSearchDTO.getTrayCode())){
+
+			//查询托盘编码
+			BasicdataTrayEntity trayByTrayCode = basicdataTrayClient.getTrayByTrayCode(taskSearchDTO.getTrayCode());
+			Optional<BasicdataTrayEntity> trayByTrayCode1 = Optional.ofNullable(trayByTrayCode);
+			if(!trayByTrayCode1.isPresent()){
+				Resp.scanFail("托盘码不存在！","托盘码不存在！");
+			}
+
+
 			//查询传入的托盘数据
 			List<QuestDetailEntity> list = getQuestDetailList(taskSearchDTO,myCurrentWarehouse.getId(),trayByTrayCode.getId());
 //			List<TaskTrayVO> list =	getTaskTrayInfo(page,taskSearchDTO,collect);// 查询有没有当次盘点任务的托盘数据
@@ -315,12 +319,12 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 
 		}else{
 			//查询有没有托盘的数据
-			List<QuestDetailEntity> list1 = getQuestDetailList(taskSearchDTO,myCurrentWarehouse.getId(),trayByTrayCode.getId());
+			List<QuestDetailEntity> list1 = getQuestDetailList(taskSearchDTO,myCurrentWarehouse.getId(),null);
 			if(!list1.isEmpty()){
 //				int sum = list1.stream().mapToInt(QuestDetailEntity::getStockNum).sum(); //总数
 				return R.data(getTaskTrayInfo(list1,1));
 			}
-			return  null;
+			return  R.success("成功");
 		}
 
 	}
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/wrapper/TaskQuestVOWrapper.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/wrapper/TaskQuestVOWrapper.java
index bf037e92d..8461d990b 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/wrapper/TaskQuestVOWrapper.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/wrapper/TaskQuestVOWrapper.java
@@ -20,8 +20,10 @@ package com.logpm.warehouse.wrapper;
 import com.logpm.warehouse.vo.TaskQuestVO;
 import org.springblade.common.constant.DictBizConstant;
 import org.springblade.core.mp.support.BaseEntityWrapper;
+import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.SpringUtil;
 import org.springblade.system.cache.DictBizCache;
+import org.springblade.system.entity.User;
 import org.springblade.system.feign.IUserClient;