From 1b0953e72217f63bbc83d15d49afd5f1cb6577f8 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期日, 28 四月 2024 23:19:52 +0800
Subject: [PATCH] 修改了memo代码

---
 zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java
index 29b9fbb..dcb41ca 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java
@@ -1,6 +1,7 @@
 package com.ruoyi.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.core.domain.AjaxResult;
@@ -307,6 +308,12 @@
     }
 
     @Override
+    public AjaxResult selectType() {
+        List<String> lis = list(new QueryWrapper<ZfProperty>().select("distinct (type)").lambda()).stream().map(ZfProperty::getType).collect(Collectors.toList());
+        return AjaxResult.success(lis);
+    }
+
+    @Override
     public List<ZfProperty> selectByFamilyIds(Long[] familyIds) {
         LambdaQueryWrapper<ZfProperty> lqw = new LambdaQueryWrapper<>();
         lqw.in(ZfProperty::getFamilyId,familyIds);
@@ -536,12 +543,14 @@
             //鍒犻櫎es涓殑鏁版嵁
             zfPropertys.stream().forEach(zfProperty -> {
                 EsModel esModel = esService.findByCtId(zfProperty.getId().intValue(), "瀹跺涵璧勪骇");
+                if(esModel!=null)
+                {
                 DeleteRequest deleteRequest = new DeleteRequest("allsearchdata", esModel.getId());
                 try {
                     restHighLevelClient.delete(deleteRequest,RequestOptions.DEFAULT);
                 } catch (IOException e) {
                     throw new RuntimeException(e);
-                }
+                }}
             });
             return AjaxResult.success();
         }else {

--
Gitblit v1.9.1