From 169b76589cc110fb65db705530ae4bfc60c8f003 Mon Sep 17 00:00:00 2001 From: lg Date: Sat, 25 Oct 2025 20:23:02 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/dromara/xzd/domain/XzdCustomertypeInfo.java | 4 ++-- .../org/dromara/xzd/domain/bo/XzdCustomerSupplierBo.java | 5 ++--- .../org/dromara/xzd/domain/bo/XzdCustomertypeInfoBo.java | 3 ++- .../xzd/service/impl/XzdCustomerSupplierServiceImpl.java | 1 - 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdCustomertypeInfo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdCustomertypeInfo.java index e7da61e8..703764c9 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdCustomertypeInfo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdCustomertypeInfo.java @@ -14,9 +14,9 @@ import java.io.Serial; * @date 2025-09-30 */ @Data -//@EqualsAndHashCode(callSuper = true) +@EqualsAndHashCode(callSuper = true) @TableName("xzd_customertype_info") -public class XzdCustomertypeInfo { +public class XzdCustomertypeInfo extends BaseEntity { @Serial private static final long serialVersionUID = 1L; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdCustomerSupplierBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdCustomerSupplierBo.java index 8c8e0ae6..97227628 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdCustomerSupplierBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdCustomerSupplierBo.java @@ -16,12 +16,11 @@ import jakarta.validation.constraints.*; * @date 2025-10-24 */ @Data -@EqualsAndHashCode(callSuper = true) @AutoMapper(target = XzdCustomerSupplier.class, reverseConvertGenerate = false) -public class XzdCustomerSupplierBo extends BaseEntity { +public class XzdCustomerSupplierBo { /** - * + * */ @NotNull(message = "不能为空", groups = { EditGroup.class }) private Long id; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdCustomertypeInfoBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdCustomertypeInfoBo.java index 2c283196..014e46ac 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdCustomertypeInfoBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdCustomertypeInfoBo.java @@ -16,8 +16,9 @@ import jakarta.validation.constraints.*; * @date 2025-09-30 */ @Data +@EqualsAndHashCode(callSuper = true) @AutoMapper(target = XzdCustomertypeInfo.class, reverseConvertGenerate = false) -public class XzdCustomertypeInfoBo { +public class XzdCustomertypeInfoBo extends BaseEntity { /** * 1客户 2供应商 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdCustomerSupplierServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdCustomerSupplierServiceImpl.java index d0adb310..1c79c54d 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdCustomerSupplierServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdCustomerSupplierServiceImpl.java @@ -72,7 +72,6 @@ public class XzdCustomerSupplierServiceImpl extends ServiceImpl buildQueryWrapper(XzdCustomerSupplierBo bo) { - Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); lqw.orderByDesc(XzdCustomerSupplier::getId); lqw.eq(StringUtils.isNotBlank(bo.getType()), XzdCustomerSupplier::getType, bo.getType());