From 870dc38de093a1f49b134238c7d29498e25ad8ff Mon Sep 17 00:00:00 2001
From: whywhyo <1511349576@qq.com>
Date: 星期二, 16 五月 2023 17:59:43 +0800
Subject: [PATCH] 55
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZfEconomyServiceImpl.java | 4 ++--
zhang-content/src/main/java/com/ruoyi/domain/ZfEconomy.java | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/ZfEconomy.java b/zhang-content/src/main/java/com/ruoyi/domain/ZfEconomy.java
index 33485af..d77272d 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZfEconomy.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZfEconomy.java
@@ -34,8 +34,8 @@
/**
* 0锛氬熀閲戙��1锛氬彴璐�
*/
- @Excel(name = "鏀舵敮绫诲瀷",readConverterExp = "0=鍩洪噾,1=鍙拌处")
- private Integer type;
+ @Excel(name = "鏀舵敮绫诲瀷")
+ private String type;
/**
* 鏃堕棿
@@ -64,8 +64,8 @@
/**
* 0:鐜伴噾,1:鑷姩鍒掓墸
*/
- @Excel(name = "鐜伴噾/鑷姩鍒掓墸",readConverterExp = "0=鐜伴噾,1=鑷姩鍒掓墸")
- private Integer kind;
+ @Excel(name = "鐜伴噾/鑷姩鍒掓墸")
+ private String kind;
/**
* 浣欓
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEconomyServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEconomyServiceImpl.java
index 4525007..6929649 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEconomyServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEconomyServiceImpl.java
@@ -49,8 +49,8 @@
private LambdaQueryWrapper<ZfEconomy> buildCondition(ZfEconomy zfEconomy) {
LambdaQueryWrapper<ZfEconomy> lqw = new LambdaQueryWrapper<>();
- lqw.eq(zfEconomy.getType()!=null,ZfEconomy::getType,zfEconomy.getType());
- lqw.eq(zfEconomy.getKind()!=null,ZfEconomy::getKind,zfEconomy.getKind());
+ lqw.eq(StringUtils.isNotEmpty(zfEconomy.getType()),ZfEconomy::getType,zfEconomy.getType());
+ lqw.eq(StringUtils.isNotEmpty(zfEconomy.getKind()),ZfEconomy::getKind,zfEconomy.getKind());
lqw.like(StringUtils.isNotEmpty(zfEconomy.getPrice()),ZfEconomy::getPrice,zfEconomy.getPrice());
lqw.like(StringUtils.isNotEmpty(zfEconomy.getUseFor()),ZfEconomy::getUseFor,zfEconomy.getUseFor());
lqw.like(StringUtils.isNotEmpty(zfEconomy.getUsePeople()),ZfEconomy::getUsePeople,zfEconomy.getUsePeople());
--
Gitblit v1.9.1