From edc0b4ee1fb8b292635667379387cc0e76e5af01 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期二, 10 九月 2024 16:21:03 +0800
Subject: [PATCH] 修改了bug

---
 zhang-content/src/main/java/com/ruoyi/service/impl/ZfClanServiceImpl.java |   90 ++++++++++++++++++++++++++++-----------------
 1 files changed, 56 insertions(+), 34 deletions(-)

diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfClanServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfClanServiceImpl.java
index b34ee23..8cc19a4 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfClanServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfClanServiceImpl.java
@@ -19,6 +19,7 @@
 
 import javax.annotation.Resource;
 import java.io.IOException;
+import java.sql.SQLIntegrityConstraintViolationException;
 import java.time.LocalDateTime;
 import java.util.*;
 
@@ -158,43 +159,64 @@
         zfLog.setModule("瀹舵棌");
 //        zfLog.setUpdater(zInfoUserService.getMyself().getNickName());
         zfLogService.save(zfLog);
+
+        LambdaQueryWrapper<ZfClan> lqw = new LambdaQueryWrapper<>();
+        lqw.orderByDesc(ZfClan::getClanId);
+        lqw.eq(StringUtils.isNotEmpty(zfClan.getClanName()), ZfClan::getClanName, zfClan.getClanName());
+        List<ZfClan> lis = this.list(lqw);
 //        System.out.println("===================================="+meeting);
-        if(updateById(zfClan)){
-            //鍒版暟鎹簱涓煡璇㈠搴旂殑鏁版嵁
-            ZfClan dataById = getById(zfClan.getClanId());
+        if(lis.size()>0)
+        {
+            return AjaxResult.success("瀹舵棌鍚嶇О涓嶈兘閲嶅锛�");
 
-            //鍏堝埌es涓煡璇㈠埌瀵瑰簲閭f潯鏁版嵁鍦╡s鐨刬d
-            EsModel esResult = esSer.findByCtId(dataById.getClanId(), "瀹舵棌");
-//            System.out.println("===================================="+meeting);
-            if (esResult == null){
-                return AjaxResult.success();
-            }
-
-            //鎿嶄綔es淇敼鏁版嵁
-            EsModel newModel = new EsModel();
-            if(zfClan.getClanName()!=null){
-                newModel.setBy1(zfClan.getClanName());
-            }else {
-                newModel.setBy1(dataById.getClanName());
-            }
-//
-
-            UpdateRequest updateRequest = new UpdateRequest("allsearchdata", esResult.getId());
-            updateRequest.doc(
-                    "by1",newModel.getBy1()
-
-            );
-
-            try {
-                restHighLevelClient.update(updateRequest, RequestOptions.DEFAULT);
-            } catch (IOException e) {
-                throw new RuntimeException(e);
-            }
-
-            return AjaxResult.success();
-        }else {
-            return AjaxResult.error();
         }
+        else
+        {
+            boolean res = updateById(zfClan);
+            return AjaxResult.success();
+        }
+
+          //  if(res){
+
+          //  }else {
+          //      return AjaxResult.success("瀹舵棌鍚嶇О涓嶈兘閲嶅锛�");
+          //  }
+
+
+
+      //  return AjaxResult.success("瀹舵棌鍚嶇О涓嶈兘閲嶅锛�");
+//            //鍒版暟鎹簱涓煡璇㈠搴旂殑鏁版嵁
+//            ZfClan dataById = getById(zfClan.getClanId());
+//
+//            //鍏堝埌es涓煡璇㈠埌瀵瑰簲閭f潯鏁版嵁鍦╡s鐨刬d
+//            EsModel esResult = esSer.findByCtId(dataById.getClanId(), "瀹舵棌");
+////            System.out.println("===================================="+meeting);
+//            if (esResult == null){
+//                return AjaxResult.success();
+//            }
+//
+//            //鎿嶄綔es淇敼鏁版嵁
+//            EsModel newModel = new EsModel();
+//            if(zfClan.getClanName()!=null){
+//                newModel.setBy1(zfClan.getClanName());
+//            }else {
+//                newModel.setBy1(dataById.getClanName());
+//            }
+////
+//
+//            UpdateRequest updateRequest = new UpdateRequest("allsearchdata", esResult.getId());
+//            updateRequest.doc(
+//                    "by1",newModel.getBy1()
+//
+//            );
+
+//            try {
+//                restHighLevelClient.update(updateRequest, RequestOptions.DEFAULT);
+//            } catch (IOException e) {
+//                throw new RuntimeException(e);
+//            }
+
+
     }
 
     @Override

--
Gitblit v1.9.1