From 58e6c0785c1c0118356ec4209e66613f46f9253d Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 31 十二月 2024 18:38:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 applet/src/main/java/com/jilongda/applet/controller/TLineUpController.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/applet/src/main/java/com/jilongda/applet/controller/TLineUpController.java b/applet/src/main/java/com/jilongda/applet/controller/TLineUpController.java
index 1f63022..ecb534a 100644
--- a/applet/src/main/java/com/jilongda/applet/controller/TLineUpController.java
+++ b/applet/src/main/java/com/jilongda/applet/controller/TLineUpController.java
@@ -77,7 +77,7 @@
         long count = tLineUpService.count(Wrappers.lambdaQuery(TLineUp.class)
                 .eq(TLineUp::getStoreId, storeId)
                 .eq(TLineUp::getStatus, 1)
-                .lt(TLineUp::getCode, lineUp.getCode())
+                .lt(lineUp!=null,TLineUp::getCode, lineUp.getCode())
                 .likeRight(TLineUp::getCreateTime, LocalDate.now()));
         tLineUpVO.setLinUpCount(count);
         return ApiResult.success(tLineUpVO);

--
Gitblit v1.7.1