From bf1ce234766d113ca6380ab4d79cb5b2c5049395 Mon Sep 17 00:00:00 2001
From: zqy <252236926@qq.com>
Date: 星期一, 09 六月 2025 17:06:31 +0800
Subject: [PATCH] 修改权限问题
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZfEconomyServiceImpl.java | 2 +-
zhang-content/src/main/java/com/ruoyi/service/impl/ZfPetServiceImpl.java | 7 ++-----
zhang-content/src/main/java/com/ruoyi/service/impl/ZfCollectionServiceImpl.java | 2 +-
zhang-content/src/main/java/com/ruoyi/service/impl/ZfEventServiceImpl.java | 2 +-
zhang-content/src/main/java/com/ruoyi/service/impl/ZfContactServiceImpl.java | 2 +-
zhang-content/src/main/java/com/ruoyi/service/impl/ZfDoctorServiceImpl.java | 2 +-
zhang-content/src/main/java/com/ruoyi/service/impl/ZfEquipmentServiceImpl.java | 2 +-
zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java | 4 +++-
zhang-content/src/main/java/com/ruoyi/service/impl/ZfCleanServiceImpl.java | 2 +-
9 files changed, 12 insertions(+), 13 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 eda53a9..987ec1a 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
@@ -319,7 +319,7 @@
public List<ZfProperty> markOwnData(Long familyId,Long fatherFamilyId, Long motherFamilyId,List<ZfProperty> 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);
@@ -453,6 +453,8 @@
}
}
+
+
@Resource
ZfLogService zfLogService;
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfCleanServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfCleanServiceImpl.java
index 4b5f451..404195a 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfCleanServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfCleanServiceImpl.java
@@ -289,7 +289,7 @@
public List<ZfClean> markOwnData(Long familyId,Long fatherFamilyId, Long motherFamilyId,List<ZfClean> 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);
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfCollectionServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfCollectionServiceImpl.java
index 61a4168..7e10031 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfCollectionServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfCollectionServiceImpl.java
@@ -288,7 +288,7 @@
public List<ZfCollection> markOwnData(Long familyId,Long fatherFamilyId, Long motherFamilyId,List<ZfCollection> 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);
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfContactServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfContactServiceImpl.java
index 6f305a8..2798b11 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfContactServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfContactServiceImpl.java
@@ -270,7 +270,7 @@
public List<ZfContact> markOwnData(Long familyId,Long fatherFamilyId, Long motherFamilyId, List<ZfContact> 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);
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 8301759..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
@@ -156,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);
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEconomyServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEconomyServiceImpl.java
index 7997802..083f2fc 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEconomyServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEconomyServiceImpl.java
@@ -349,7 +349,7 @@
public List<ZfEconomy> markOwnData(Long familyId,Long fatherFamilyId, Long motherFamilyId,List<ZfEconomy> 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);
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEquipmentServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEquipmentServiceImpl.java
index f28d240..be311c8 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEquipmentServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEquipmentServiceImpl.java
@@ -278,7 +278,7 @@
public List<ZfEquipment> markOwnData(Long familyId,Long fatherFamilyId, Long motherFamilyId, List<ZfEquipment> 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);
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEventServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEventServiceImpl.java
index 3f89e2c..de001af 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEventServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEventServiceImpl.java
@@ -255,7 +255,7 @@
public List<ZfEvent> markOwnData(Long familyId,Long fatherFamilyId, Long motherFamilyId,List<ZfEvent> 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);
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfPetServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfPetServiceImpl.java
index 3242f33..aaa7418 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfPetServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfPetServiceImpl.java
@@ -18,10 +18,7 @@
import javax.annotation.Resource;
import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
+import java.util.*;
import java.util.stream.Collectors;
import static com.ruoyi.constant.MenuAuthority.*;
@@ -114,7 +111,7 @@
public List<ZfPet> markOwnData(Long familyId,Long fatherFamilyId, Long motherFamilyId,List<ZfPet> 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);
--
Gitblit v1.9.1