From 7185db025a772630265cfd1a0410743e6e37ed05 Mon Sep 17 00:00:00 2001 From: feige <feige@qq.com> Date: 星期日, 02 六月 2024 18:11:27 +0800 Subject: [PATCH] 修改了删除功能 --- zhang-content/src/main/java/com/ruoyi/service/impl/ZfDoctorServiceImpl.java | 34 ++++++++++++++++++++++++++-------- 1 files changed, 26 insertions(+), 8 deletions(-) diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfDoctorServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfDoctorServiceImpl.java index dca3b77..bdafaa5 100644 --- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfDoctorServiceImpl.java +++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfDoctorServiceImpl.java @@ -72,6 +72,11 @@ // return AjaxResult.success(data); //瑕佹煡鑷繁瀹跺涵鐨� ZInfoUser myself = zInfoUserService.getMyself(); + if(myself==null) + { + // System.out.println("ssssss"); + return AjaxResult.success("鎮ㄦ病鍔犲叆鍒板搴旂殑瀹跺涵锛岃鑱旂郴绠$悊鍛�"); + } Long familyId = myself.getFamilyId(); //涔熻鏌ュ埆浜烘巿鏉冪殑 List<ZAuthority> authority = zAuthorityService.getAuthority(); @@ -150,10 +155,15 @@ } log.info("鏁版嵁鍒楄〃涓猴細{}", dataList); - for (ZfDoctor zfDoctor : dataList) { - zfDoctorService.addData(zfDoctor); - } + for (ZfDoctor zfDoctor : dataList) { + if (zfDoctor.getSymptom().length() == 0 || zfDoctor.getSymptom() == null) { + throw new RuntimeException("鐥囩姸涓虹┖锛屽鍏ユ暟鎹け璐�"); + } + else { + zfDoctorService.addData(zfDoctor); + } + } return AjaxResult.success("瀵煎叆鏁版嵁鎴愬姛"); } @@ -246,6 +256,10 @@ //鍏堝埌es涓煡璇㈠埌瀵瑰簲閭f潯鏁版嵁鍦╡s鐨刬d EsModel esResult = esService.findByCtId(dataById.getId().intValue(), "瀹跺涵灏忓尰鐢�"); + if (esResult == null){ + return AjaxResult.success(); + } + //鎿嶄綔es淇敼鏁版嵁 EsModel newModel = new EsModel(); if(zfDoctor.getType()!=null){ @@ -337,11 +351,15 @@ //鍒犻櫎es涓殑鏁版嵁 zfDoctors.stream().forEach(zfDoctor -> { EsModel esModel = esService.findByCtId(zfDoctor.getId().intValue(), "瀹跺涵灏忓尰鐢�"); - DeleteRequest deleteRequest = new DeleteRequest("allsearchdata", esModel.getId()); - try { - restHighLevelClient.delete(deleteRequest,RequestOptions.DEFAULT); - } catch (IOException e) { - throw new RuntimeException(e); + + 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(); -- Gitblit v1.9.1