From ac3aa95b729366bd9f3a1585bbab84f75709b062 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 03 十二月 2024 20:21:29 +0800
Subject: [PATCH] 修改个人婚姻模块bug
---
zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java | 27 +++++++++++++++++++--------
1 files changed, 19 insertions(+), 8 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 0c73e22..95b3e0f 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
@@ -6,18 +6,13 @@
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.bean.BeanUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.constant.MenuAuthority;
import com.ruoyi.domain.*;
import com.ruoyi.mapper.ZfPropertyMapper;
import com.ruoyi.service.*;
-import com.ruoyi.util.ArraysUtil;
import lombok.extern.slf4j.Slf4j;
import org.elasticsearch.action.delete.DeleteRequest;
import org.elasticsearch.action.update.UpdateRequest;
@@ -29,8 +24,6 @@
import javax.annotation.Resource;
import java.io.IOException;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
import java.util.*;
import java.util.stream.Collectors;
@@ -64,6 +57,15 @@
@Resource
RestHighLevelClient restHighLevelClient;
+
+ @Resource
+ private IZfPropertyDownloadService zfPropertyDownloadService;
+
+ @Resource
+ private IZfPropertyShareService iZfPropertyShareService;
+
+ @Resource
+ private MemoBookService memoBookService;
// private LambdaQueryWrapper<ZfProperty> buildCondition(ZfProperty zfProperty) {
@@ -290,7 +292,7 @@
fatherFaId = zInfoUserService.getInfoById(myself.getFatherId()).getFamilyId();
Long motherFaId = 0L;
if(myself.getMomId()!=null)
- motherFaId = zInfoUserService.getInfoBysysId(myself.getMomId()).getFamilyId();
+ motherFaId = zInfoUserService.getInfoById(myself.getMomId()).getFamilyId();
//鍔犱笂鑷繁瀹跺涵鐨刬d
idList.add(familyId);
@@ -563,10 +565,17 @@
if (!familyIdList.contains(data.getFamilyId())){
throw new RuntimeException("浣犳病鏈夋潈闄愭搷浣滄瀹跺涵鐨勬暟鎹�");
}
+ List<MemoBook> memoBookService1 = memoBookService.selectByIdAFid(data.getId().longValue(),2007L);
+ if (memoBookService1.size() != 0 && !memoBookService.removeByIds(memoBookService1))
+ return AjaxResult.error();
+
}
List<ZfProperty> zfPropertys = listByIds(Arrays.asList(ids));
+ if (! (zfPropertyDownloadService.deleteData(ids) && iZfPropertyShareService.deleteByContentId(ids))){
+ return AjaxResult.error();
+ }
if (zfPropertyService.removeByIds(Arrays.asList(ids))) {
//鍒犻櫎es涓殑鏁版嵁
@@ -581,6 +590,8 @@
throw new RuntimeException(e);
}}
});
+ System.out.println("15165132165346153246153");
+
return AjaxResult.success();
}else {
return AjaxResult.error();
--
Gitblit v1.9.1