From 60fa13f76afe72a6f48416de2904d58164859382 Mon Sep 17 00:00:00 2001
From: houzhongjian <houzhongyi@126.com>
Date: 星期五, 17 一月 2025 13:51:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/impl/MmItemOutputServiceImpl.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/impl/MmItemOutputServiceImpl.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/impl/MmItemOutputServiceImpl.java
index 0e3bdc7..ff058ab 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/impl/MmItemOutputServiceImpl.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/impl/MmItemOutputServiceImpl.java
@@ -84,6 +84,15 @@
}
@Override
+ public List<MmItemOutputEntity> getByItemid(String itemid, String resultstr, List<Integer> resultIndexs) {
+ QueryWrapper<MmItemOutputEntity> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("itemid", itemid)
+ .eq("resultstr", resultstr)
+ .in(!CollectionUtils.isEmpty(resultIndexs), "result_index", resultIndexs);
+ return mmItemOutputDao.selectList(queryWrapper);
+ }
+
+ @Override
public void deleteByItemId(String itemId) {
QueryWrapper<MmItemOutputEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("itemid", itemId);
@@ -101,7 +110,9 @@
return outputMap.get(outputid);
}
MmItemOutputEntity entity = mmItemOutputDao.selectById(outputid);
- outputMap.put(outputid, entity);
- return entity;
+ if (entity != null) {
+ outputMap.put(outputid, entity);
+ }
+ return outputMap.get(outputid);
}
}
--
Gitblit v1.9.3