From 11a30e1daef6d1a145385d1b0d545f43aaeeb7dc Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Fri, 14 Feb 2025 15:39:58 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E7=9A=84tokenredis=E5=AD=98=E5=82=A8=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/springblade/common/utils/DefaultUserTokenConfig.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/blade-biz-common/src/main/java/org/springblade/common/utils/DefaultUserTokenConfig.java b/blade-biz-common/src/main/java/org/springblade/common/utils/DefaultUserTokenConfig.java index d66a8dea0..9b0ce7841 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/utils/DefaultUserTokenConfig.java +++ b/blade-biz-common/src/main/java/org/springblade/common/utils/DefaultUserTokenConfig.java @@ -2,7 +2,7 @@ package org.springblade.common.utils; public class DefaultUserTokenConfig { /** - * 默认用户的token 超时时间 + * 默认用户的token 超时时间 */ - public static final Long EXPIRE_TIME = 7 *24 * 60 * 60 * 1000L; + public static final Long EXPIRE_TIME = 7 * 24 * 60 * 60L; } From fdb8ac1598885d7d509c1210b63b772c3b3d2156 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Fri, 14 Feb 2025 16:04:56 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=93=81=E7=B1=BB=E5=93=81=E7=89=8CBUG?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basicdata/mapper/BasicdataBrandCategoryMapper.java | 2 +- .../basicdata/mapper/BasicdataBrandCategoryMapper.xml | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataBrandCategoryMapper.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataBrandCategoryMapper.java index bc78bf873..8f26b01e1 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataBrandCategoryMapper.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataBrandCategoryMapper.java @@ -50,5 +50,5 @@ public interface BasicdataBrandCategoryMapper extends BaseMapper selectBasicdataBrandCategoryPage(IPage page, BasicdataBrandCategoryVO basicdataBrandCategory); + IPage selectBasicdataBrandCategoryPage(IPage page,@Param("param") BasicdataBrandCategoryVO basicdataBrandCategory); } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataBrandCategoryMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataBrandCategoryMapper.xml index fd4f395fa..842ca2ae3 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataBrandCategoryMapper.xml +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataBrandCategoryMapper.xml @@ -41,6 +41,15 @@ logpm_basicdata_brand_category AS lbbc LEFT JOIN logpm_basicdata_brand AS lbb ON lbbc.brand_id = lbb.id LEFT JOIN logpm_basicdata_category AS lbc ON lbbc.category_id = lbc.id + + lbbc.is_deleted = 0 + + AND lbb.id = #{param.brandName} + + + AND lbc.id = #{param.name} + + GROUP BY lbbc.id