diff --git a/src/main/java/neatlogic/module/process/service/NewWorkcenterServiceImpl.java b/src/main/java/neatlogic/module/process/service/NewWorkcenterServiceImpl.java index 8fce1ea094d0e46ff7666c73be6c1b6e515bee76..b9687e1384ac6900f796d2fb2552b609f63c174a 100644 --- a/src/main/java/neatlogic/module/process/service/NewWorkcenterServiceImpl.java +++ b/src/main/java/neatlogic/module/process/service/NewWorkcenterServiceImpl.java @@ -425,7 +425,10 @@ public class NewWorkcenterServiceImpl implements NewWorkcenterService { // 搜索SerialNumber JSONObject titleObj = new JSONObject(); - List processTaskVoList = processTaskMapper.getProcessTaskBySerialNumberList(new ArrayList<>(workcenterVo.getKeywordList())); + List processTaskVoList = new ArrayList<>(); + if (CollectionUtils.isNotEmpty(workcenterVo.getKeywordList())) { + processTaskVoList = processTaskMapper.getProcessTaskBySerialNumberList(workcenterVo.getKeywordList()); + } titleObj.put("dataList", processTaskVoList.stream().map(ProcessTaskVo::getSerialNumber).collect(Collectors.toList())); titleObj.put("value", ProcessTaskSqlTable.FieldEnum.SERIAL_NUMBER.getValue()); titleObj.put("text", ProcessTaskSqlTable.FieldEnum.SERIAL_NUMBER.getText()); @@ -433,7 +436,9 @@ public class NewWorkcenterServiceImpl implements NewWorkcenterService { // 搜索ID titleObj = new JSONObject(); - processTaskVoList = processTaskMapper.getProcessTaskByIdStrList(new ArrayList<>(workcenterVo.getKeywordList())); + if (CollectionUtils.isNotEmpty(workcenterVo.getKeywordList())) { + processTaskVoList = processTaskMapper.getProcessTaskByIdStrList(workcenterVo.getKeywordList()); + } titleObj.put("dataList", processTaskVoList.stream().map(ProcessTaskVo::getId).collect(Collectors.toList())); titleObj.put("value", ProcessTaskSqlTable.FieldEnum.ID.getValue()); titleObj.put("text", ProcessTaskSqlTable.FieldEnum.ID.getText());