From d93b232662d6d90f858996769a7d89ff0b4cf88c Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 14 一月 2025 16:48:08 +0800
Subject: [PATCH] 重新提交修改了个人记事本bug
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZSecretServiceImpl.java | 27 +++++++++++++++++++++++++--
1 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZSecretServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZSecretServiceImpl.java
index 87e1d66..baa26ae 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZSecretServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZSecretServiceImpl.java
@@ -11,8 +11,6 @@
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.domain.ZSecret;
-import com.ruoyi.domain.ZSecret;
-import com.ruoyi.domain.ZfEvent;
import com.ruoyi.mapper.ZSecretMapper;
import com.ruoyi.service.ZSecretService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -20,6 +18,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
+import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
@@ -39,6 +38,9 @@
@Autowired
ZSecretServiceImpl zSecretService;
+ @Resource
+ ZSecretMapper zSecretMapper;
+
private LambdaQueryWrapper<ZSecret> uniqueCondition(ZSecret zSecret) {
LambdaQueryWrapper<ZSecret> lqw = new LambdaQueryWrapper<>();
lqw.eq(StringUtils.isNotEmpty(zSecret.getType()), ZSecret::getType, zSecret.getType())
@@ -57,8 +59,12 @@
lqw.eq(userId != null, ZSecret::getUserId, userId)
.like(StringUtils.isNotEmpty(zSecret.getType()), ZSecret::getType, zSecret.getType())
.like(StringUtils.isNotEmpty(zSecret.getAccNo()), ZSecret::getAccNo, zSecret.getAccNo())
+ .like(StringUtils.isNotEmpty(zSecret.getRemark()), ZSecret::getRemark, zSecret.getRemark())
+ .like(StringUtils.isNotEmpty(zSecret.getLocation()), ZSecret::getLocation, zSecret.getLocation())
.eq(zSecret.getIsFinger()!=null,ZSecret::getIsFinger,zSecret.getIsFinger())
.eq(zSecret.getIsPrivate()!=null,ZSecret::getIsPrivate,zSecret.getIsPrivate())
+ .le(zSecret.getValidityDate()!=null, ZSecret::getValidityDate, zSecret.getValidityDate())
+ .eq(zSecret.getIsFace()!=null,ZSecret::getIsFace,zSecret.getIsFace())
.between(zSecret.getHappenStartTime() != null && zSecret.getHappenEndTime() != null, ZSecret::getHappenTime, zSecret.getHappenStartTime(), zSecret.getHappenEndTime())
.orderByDesc(ZSecret::getCreateTime);
return lqw;
@@ -116,6 +122,23 @@
}
@Override
+ public List<ZSecret> selectByCondition() {
+ SysUser user = SecurityUtils.getLoginUser().getUser();
+ Long userId = user.getUserId();
+ ZSecret zSecret = new ZSecret();
+
+ LambdaQueryWrapper<ZSecret> lqw = buildCondition(zSecret, userId);
+ return list(lqw);
+
+ }
+
+ @Override
+ public AjaxResult listType() {
+ List<String> result = zSecretMapper.listType();
+ return AjaxResult.success(result);
+ }
+
+ @Override
@Transactional
public AjaxResult importExcel(MultipartFile file) {
--
Gitblit v1.9.1