From 8f918cb6db02c39e67ce7b0d77cc1be5ed26edaf Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期五, 25 八月 2023 11:03:28 +0800
Subject: [PATCH] # 企业端用户
---
server/src/main/java/doumeemes/service/business/impl/DeviceServiceImpl.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/server/src/main/java/doumeemes/service/business/impl/DeviceServiceImpl.java b/server/src/main/java/doumeemes/service/business/impl/DeviceServiceImpl.java
index dbaafcf..dc253be 100644
--- a/server/src/main/java/doumeemes/service/business/impl/DeviceServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/business/impl/DeviceServiceImpl.java
@@ -332,7 +332,7 @@
QueryWrapper<WarehouseLocation> warehouseLocationQuery = new QueryWrapper<>();
warehouseLocationQuery.lambda()
.eq(WarehouseLocation::getRootDepartId,department.getRootId())
- .eq(WarehouseLocation::getUnionName
+ .in(WarehouseLocation::getUnionName
,Arrays.asList(s.getFinishWarehouseLocationName(),s.getProduceWarehouseLocationName()));
if(Objects.equals(list.size(),2)){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"搴撲綅淇℃伅宸插瓨鍦�");
@@ -361,8 +361,8 @@
device.setStationCode(s.getStationCode());
// device.setGroupId();
// device.setSerialNum();
- device.setProduceWarehouseLocationId(collect.get(s.getProduceWarehouseLocationName()).getId());
- device.setFinishWarehouseLocationId(collect.get(s.getFinishWarehouseLocationName()).getId());
+ device.setProduceWarehouseLocationId(Optional.ofNullable(collect.get(s.getProduceWarehouseLocationName())).map(m->m.getId()).orElse(null));
+ device.setFinishWarehouseLocationId(Optional.ofNullable(collect.get(s.getFinishWarehouseLocationName())).map(m->m.getId()).orElse(null));
deviceMapper.insert(device);
if(StringUtils.isNotBlank(s.getUserIds())){
this.dealDeviceUserId(Constants.ZERO,device.getUserIds().trim(),device.getId(),user);
--
Gitblit v1.9.3