人员设备台账-导入/维护时设备非必填

blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/service/impl/EquipmentMaintenanceServiceImpl.java

@@ -110,23 +110,28 @@ public class EquipmentMaintenanceServiceImpl extends BaseServiceImpl<EquipmentMa
             return R.fail("工号:" + String.join(",", codes) + "不存在。");
         }
         //查询设备信息
-        Set<String> deviceCode = importList.stream().map(EquipmentMaintenanceImport::getDeviceCode)
+        Set<String> deviceCode = importList.stream()
+                .map(EquipmentMaintenanceImport::getDeviceCode)
+                .filter(code -> code != null && !code.trim().isEmpty())
                 .collect(Collectors.toSet());
-        LambdaQueryWrapper<EquipmentEntity> equipmentEntityLambdaQueryWrapper = new LambdaQueryWrapper<>();
-        equipmentEntityLambdaQueryWrapper.in(CollectionUtils.isNotEmpty(deviceCode), EquipmentEntity::getDeviceCode, deviceCode); // [8](@ref)
-        List<EquipmentEntity> equipmentEntities = equipmentMapper.selectList(equipmentEntityLambdaQueryWrapper);
-        Map<String, Long> deviceNameIds = equipmentEntities.stream().collect(Collectors.toMap(
-                entity -> entity.getDeviceCode(),
-                entity -> entity.getId()));
-        deviceCode.removeAll(deviceNameIds.keySet());
-        if (deviceCode.size() > 0) {
-            return R.fail("设备:" + String.join(",", deviceCode) + "不存在。");
+        Map<String, Long> deviceNameIds;
+        if (null != deviceCode && deviceCode.size() > 0) {
+            LambdaQueryWrapper<EquipmentEntity> equipmentEntityLambdaQueryWrapper = new LambdaQueryWrapper<>();
+            equipmentEntityLambdaQueryWrapper.in(CollectionUtils.isNotEmpty(deviceCode), EquipmentEntity::getDeviceCode, deviceCode); // [8](@ref)
+            List<EquipmentEntity> equipmentEntities = equipmentMapper.selectList(equipmentEntityLambdaQueryWrapper);
+            deviceNameIds = equipmentEntities.stream().collect(Collectors.toMap(
+                    entity -> entity.getDeviceCode(),
+                    entity -> entity.getId()));
+        } else {
+            deviceNameIds = new HashMap<>();
         }
         List<EquipmentMaintenanceEntity> saves = new ArrayList<>();
         importList.forEach(e -> {
             EquipmentMaintenanceEntity entity = new EquipmentMaintenanceEntity();
             entity.setPhId(codePostHandleIdMap.get(e.getUserCode()));
-            entity.setEquipmentId(deviceNameIds.get(e.getDeviceCode()));
+            if (e.getDeviceCode() != null && !e.getDeviceCode().trim().isEmpty()) {
+                entity.setEquipmentId(deviceNameIds.get(e.getDeviceCode()));
+            }
             entity.setEquipmentDate(e.getEquipmentDate());
             entity.setEquipmentValidityPeriod(e.getEquipmentValidityPeriod());
             entity.setMaintenanceStatus(MaintenanceStatusEnum.NORMAL.getCode().shortValue());