1.判断如果是梦天老的订单不进行推送

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataWarehouseServiceImpl.java

@@ -175,16 +175,18 @@ public class BasicdataWarehouseServiceImpl extends BaseServiceImpl<BasicdataWare
 		String deptId = user.getDeptId();
 		List<Dept> userDeptNode = deptClient.getUserDeptNode(Long.parseLong(deptId));
 		StringBuffer depts = new StringBuffer();
+
+		List<Long> deptIds = new ArrayList<>();
+
 		if (Func.isEmpty(userDeptNode)) {
 			log.error("userDeptNode用户部门信息有误+{" + userDeptNode + "}");
 			return null;
 		} else {
 			userDeptNode.forEach(u -> {
-				depts.append(u.getId()).append(",");
+				deptIds.add(u.getId());
 			});
 		}
-		String str = depts.deleteCharAt(depts.length() - 1).toString();
+		List<BasicdataWarehouseEntity> warehouseEntityList = baseMapper.selectList(Wrappers.<BasicdataWarehouseEntity>query().lambda().in(BasicdataWarehouseEntity::getDepartment, deptIds));
-		List<BasicdataWarehouseEntity> warehouseEntityList = baseMapper.selectList(Wrappers.<BasicdataWarehouseEntity>query().lambda().in(BasicdataWarehouseEntity::getDepartment, str));
 		return warehouseEntityList;
 	}
 

blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/service/impl/MtFactoryDataServiceImpl.java

@@ -33,6 +33,7 @@ import org.springblade.common.exception.CustomerException;
 import org.springblade.core.redis.cache.BladeRedis;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.api.ResultCode;
+import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
@@ -449,6 +450,12 @@ public class MtFactoryDataServiceImpl implements IMtFactoryDataService {
 		}
 		logger.info("#############sendReceiveInfo:tag{}", 10);
 
+		if(mtReceiveContentDTOList.size()==0){
+			logger.info("############# 没有找到需要配推送的订单包件");
+
+			return R.success("");
+		}
+
 		//签收信息数据存入头部数据
 		mtReceiveDTO.setReceiveContentList(mtReceiveContentDTOList);