From a2d81eff7490d9ef2e5fb45727ad86f7770c55cd Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期一, 05 一月 2026 15:08:03 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_backend
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZfEconomyServiceImpl.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
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 35bdb22..0e63b93 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
@@ -81,6 +81,15 @@
lqw.like(StringUtils.isNotEmpty(zfEconomy.getUsePeople()),ZfEconomy::getUsePeople,zfEconomy.getUsePeople());
lqw.like(StringUtils.isNotEmpty(zfEconomy.getBalance()),ZfEconomy::getBalance,zfEconomy.getBalance());
lqw.like(StringUtils.isNotEmpty(zfEconomy.getRemark()),ZfEconomy::getRemark,zfEconomy.getRemark());
+
+ if (StringUtils.isNotEmpty(zfEconomy.getIsHide())) {
+
+ lqw.and(wrapper -> wrapper
+ .ne(ZfEconomy::getIsHide, "鏄�")
+ .or()
+ .isNull(ZfEconomy::getIsHide)
+ );
+ }
if (zfEconomy.getHasAttachment() != null && zfEconomy.getHasAttachment().equals("鏄�")) {
lqw.apply("url IS NOT NULL AND url != ''");
}
@@ -661,9 +670,12 @@
String[] split = companion.split(",");
List<String> list = Arrays.asList(split);
- System.out.println("[[[[[[[["+hasAttachment);
zfEconomy.setCompanionList(list);
zfEconomy.setHasAttachment(hasAttachment);
+ zfEconomy.setIsHide("鍚�");
+
+ System.out.println("[[[[[[[["+zfEconomy);
+
return dataList(zfEconomy);
}
--
Gitblit v1.9.1