From b39a20d6b37f96e1d44c6c194ce56bd30593e3ad Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期四, 29 八月 2024 22:20:31 +0800
Subject: [PATCH] 登录用用户昵称了

---
 zhang-content/src/main/java/com/ruoyi/service/impl/ZSelfNoteServiceImpl.java |   32 +++++++++++++++++++++++++-------
 1 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZSelfNoteServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZSelfNoteServiceImpl.java
index 4a56b55..102385f 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZSelfNoteServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZSelfNoteServiceImpl.java
@@ -5,24 +5,23 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.EsModel;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.utils.MapUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.domain.ZSelfNote;
-import com.ruoyi.domain.ZSelfNote;
 import com.ruoyi.mapper.ZSelfNoteMapper;
+import com.ruoyi.service.EsService;
 import com.ruoyi.service.ZSelfNoteService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
+import javax.annotation.Resource;
+import java.util.*;
 
 /**
  * <p>
@@ -36,7 +35,10 @@
 public class ZSelfNoteServiceImpl extends ServiceImpl<ZSelfNoteMapper, ZSelfNote> implements ZSelfNoteService {
 
     @Autowired
-    ZSelfNoteServiceImpl zSelfNoteService;
+    ZSelfNoteService zSelfNoteService;
+
+    @Resource
+    private EsService esSer;
 
     private LambdaQueryWrapper<ZSelfNote> uniqueCondition(ZSelfNote zSelfNote) {
         LambdaQueryWrapper<ZSelfNote> lqw = new LambdaQueryWrapper<>();
@@ -113,6 +115,17 @@
     }
 
     @Override
+    public List<ZSelfNote> selectByCondition() {
+
+        SysUser user = SecurityUtils.getLoginUser().getUser();
+        Long userId = user.getUserId();
+
+        ZSelfNote zSelfNote = new ZSelfNote();
+        LambdaQueryWrapper<ZSelfNote> lqw = buildCondition(zSelfNote, userId);
+        return list(lqw);
+    }
+
+    @Override
     @Transactional
     public AjaxResult importExcel(MultipartFile file) {
 
@@ -127,7 +140,12 @@
         assert dataList != null;
 
         for (ZSelfNote zSelfNote : dataList) {
-            zSelfNoteService.mySave(zSelfNote);
+
+            if (zSelfNote.getTitle().length() != 0 && zSelfNote.getPeople().length() !=0){
+                mySave(zSelfNote);}
+            else {
+                throw new RuntimeException("鏈夋暟鎹殑鏍囬鎴栦汉鐗╀负绌�");
+            }
         }
 
         return AjaxResult.success();

--
Gitblit v1.9.1