From e629bce5164adc765780301114f95a60140eadd7 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 10 六月 2025 19:20:27 +0800
Subject: [PATCH] 修改婚姻bug
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZfDoctorServiceImpl.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 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 7007a8e..35b8cff 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
@@ -62,6 +62,9 @@
@Resource
ZfDoctorShareService zfDoctorShareService;
+ @Resource
+ ZfDoctorDownloadService zfDoctorDownloadService;
+
@Override
public AjaxResult selectDoctorList(ZfDoctor zfDoctor, Integer pageNum, Integer pageSize) {
@@ -87,7 +90,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();
//涔熻鏌ュ埆浜烘巿鏉冪殑
List<ZAuthority> authority = zAuthorityService.getAuthority();
@@ -153,7 +156,7 @@
public List<ZfDoctor> markOwnData(Long familyId,Long fatherFamilyId, Long motherFamilyId, List<ZfDoctor> beanRecords) {
return beanRecords.stream().peek(
bean -> {
- if (bean.getFamilyId() == familyId||(fatherFamilyId!=0L && fatherFamilyId==familyId)||(motherFamilyId!=0L && motherFamilyId==familyId)) {
+ if (Objects.equals(bean.getFamilyId(), familyId) ||(fatherFamilyId!=0L && fatherFamilyId.equals(familyId))||(motherFamilyId!=0L && motherFamilyId.equals(familyId))) {
bean.setOwnData(1);
} else {
bean.setOwnData(0);
@@ -383,7 +386,9 @@
}
}
List<ZfDoctor> zfDoctors = listByIds(Arrays.asList(ids));
-
+ if (! (zfDoctorDownloadService.deleteData(ids) && zfDoctorShareService.deleteByContentId(ids) ) ){
+ return AjaxResult.error();
+ }
if (zfDoctorService.removeByIds(Arrays.asList(ids))) {
//鍒犻櫎es涓殑鏁版嵁
--
Gitblit v1.9.1