lcj/xinnengyuan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug修改

Browse Source
This commit is contained in:
lg
2025-10-25 20:23:02 +08:00
parent 199f51ea21
commit 169b76589c
4 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdCustomertypeInfo.java
View File

@ -14,9 +14,9 @@ import java.io.Serial;
* @date 2025-09-30 * @date 2025-09-30
*/ */
@Data @Data
//@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@TableName("xzd_customertype_info") @TableName("xzd_customertype_info")
public class XzdCustomertypeInfo { public class XzdCustomertypeInfo extends BaseEntity {
@Serial @Serial
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;

5
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdCustomerSupplierBo.java
View File

@ -16,12 +16,11 @@ import jakarta.validation.constraints.*;
* @date 2025-10-24 * @date 2025-10-24
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = true)
@AutoMapper(target = XzdCustomerSupplier.class, reverseConvertGenerate = false) @AutoMapper(target = XzdCustomerSupplier.class, reverseConvertGenerate = false)
public class XzdCustomerSupplierBo extends BaseEntity { public class XzdCustomerSupplierBo {
/** /**
* *
*/ */
@NotNull(message = "不能为空", groups = { EditGroup.class }) @NotNull(message = "不能为空", groups = { EditGroup.class })
private Long id; private Long id;

3
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdCustomertypeInfoBo.java
View File

@ -16,8 +16,9 @@ import jakarta.validation.constraints.*;
* @date 2025-09-30 * @date 2025-09-30
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = true)
@AutoMapper(target = XzdCustomertypeInfo.class, reverseConvertGenerate = false) @AutoMapper(target = XzdCustomertypeInfo.class, reverseConvertGenerate = false)
public class XzdCustomertypeInfoBo { public class XzdCustomertypeInfoBo extends BaseEntity {
/** /**
* 1客户 2供应商 * 1客户 2供应商

1
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdCustomerSupplierServiceImpl.java
View File

@ -72,7 +72,6 @@ public class XzdCustomerSupplierServiceImpl extends ServiceImpl<XzdCustomerSuppl
} }
private LambdaQueryWrapper<XzdCustomerSupplier> buildQueryWrapper(XzdCustomerSupplierBo bo) { private LambdaQueryWrapper<XzdCustomerSupplier> buildQueryWrapper(XzdCustomerSupplierBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<XzdCustomerSupplier> lqw = Wrappers.lambdaQuery(); LambdaQueryWrapper<XzdCustomerSupplier> lqw = Wrappers.lambdaQuery();
lqw.orderByDesc(XzdCustomerSupplier::getId); lqw.orderByDesc(XzdCustomerSupplier::getId);
lqw.eq(StringUtils.isNotBlank(bo.getType()), XzdCustomerSupplier::getType, bo.getType()); lqw.eq(StringUtils.isNotBlank(bo.getType()), XzdCustomerSupplier::getType, bo.getType());