修改null的bug

feige

2023-11-19 6a3a60993f571c7834d4d238c12fa963126f76d9

 zhang-content/src/main/java/com/ruoyi/service/impl/ZfDoctorServiceImpl.java

@@ -246,6 +246,10 @@
            //先到es中查询到对应那条数据在es的id
            EsModel esResult = esService.findByCtId(dataById.getId().intValue(), "家庭小医生");

            if (esResult == null){
                return AjaxResult.success();
            }

            //操作es修改数据
            EsModel newModel = new EsModel();
            if(zfDoctor.getType()!=null){
@@ -337,11 +341,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();