From 9d9206ceb0c9fa20b272adcc11c2ce5fc9293eb7 Mon Sep 17 00:00:00 2001
From: cp <513960435@qq.com>
Date: 星期一, 21 十月 2024 16:33:52 +0800
Subject: [PATCH] #
---
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/TagServiceImpl.java | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/TagServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/TagServiceImpl.java
index cd2364a..5f90c5e 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/TagServiceImpl.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/TagServiceImpl.java
@@ -10,6 +10,7 @@
import org.springframework.stereotype.Service;
import java.util.Date;
+import java.util.List;
@Service("manTagService")
public class TagServiceImpl extends ServiceImpl<TagMapper, Tag> implements TagService {
@@ -51,9 +52,15 @@
if (!Cools.isEmpty(firstTagName)) {
//瀛樺湪涓�绾у垎绫伙紝鏌ヨ涓�绾у垎绫�
- Tag firstTag = this.getOne(new LambdaQueryWrapper<Tag>()
+ List<Tag> firstList = this.list(new LambdaQueryWrapper<Tag>()
.eq(Tag::getName, firstTagName)
- .eq(Tag::getHostId, hostId));
+ .eq(Tag::getHostId, hostId)
+ .orderByAsc(Tag::getCreateTime));
+ Tag firstTag = null;
+ if (!firstList.isEmpty()) {
+ firstTag = firstList.get(0);
+ }
+
if (firstTag == null) {
//涓�绾у垎绫讳负绌猴紝鍒涘缓涓�绾у垎绫�
firstTag = new Tag();
@@ -68,9 +75,14 @@
if (!Cools.isEmpty(secondTagName)) {
//瀛樺湪浜岀骇鍒嗙被锛屾煡璇簩绾у垎绫�
- Tag secondTag = this.getOne(new LambdaQueryWrapper<Tag>()
+ List<Tag> secondList = this.list(new LambdaQueryWrapper<Tag>()
.eq(Tag::getName, secondTagName)
- .eq(Tag::getHostId, hostId));
+ .eq(Tag::getHostId, hostId)
+ .orderByAsc(Tag::getCreateTime));
+ Tag secondTag = null;
+ if (!secondList.isEmpty()) {
+ secondTag = secondList.get(0);
+ }
if (secondTag == null) {
//浜岀骇鍒嗙被涓虹┖锛屽垱寤轰簩绾у垎绫�
secondTag = new Tag();
--
Gitblit v1.9.1