From d55e543b3d043f6d7250a4fe419796f02e0d8eed Mon Sep 17 00:00:00 2001 From: guoshengxiong <1923636941@qq.com> Date: Thu, 30 May 2024 17:16:54 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=BF=9B=E5=BA=A6=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/XzTaskProgressTotalServiceImpl.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzTaskProgressTotalServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzTaskProgressTotalServiceImpl.java index 3c6ed8a74..c50f57614 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzTaskProgressTotalServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzTaskProgressTotalServiceImpl.java @@ -65,15 +65,15 @@ public class XzTaskProgressTotalServiceImpl extends ServiceImpl() - .eq(XzTaskProgressTotal::getProjectSn, xzTaskProgressTotal.getProjectSn()) - .eq(XzTaskProgressTotal::getEnterpriseId, xzTaskProgressTotal.getEnterpriseId()) - .orderByDesc(XzTaskProgressTotal::getCreateDate) - .last("limit 1") - ); if (Objects.equals(xzTaskProgressTotal.getType(), 1)) { xzTaskProgressTotal.setEnterpriseId(null); } + XzTaskProgressTotal total = xzTaskProgressTotalMapper.selectOne(new LambdaQueryWrapper() + .eq(XzTaskProgressTotal::getProjectSn, xzTaskProgressTotal.getProjectSn()) + .eq(xzTaskProgressTotal.getEnterpriseId() != null, XzTaskProgressTotal::getEnterpriseId, xzTaskProgressTotal.getEnterpriseId()) + .orderByDesc(XzTaskProgressTotal::getCreateDate) + .last("limit 1") + ); if (total != null) { xzTaskProgressTotal.setChangeBefore(total.getChangeAfter()); } else {