From f8d1143ef6cfbbaaebe3b25efa24ee19c9ea61c8 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 10 Jan 2024 16:52:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/ownersCommittee/controller/OwnersCommitteeMemberController.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/ownersCommittee/controller/OwnersCommitteeMemberController.java b/src/main/java/org/springblade/modules/ownersCommittee/controller/OwnersCommitteeMemberController.java
index 7fafe29..4ead02d 100644
--- a/src/main/java/org/springblade/modules/ownersCommittee/controller/OwnersCommitteeMemberController.java
+++ b/src/main/java/org/springblade/modules/ownersCommittee/controller/OwnersCommitteeMemberController.java
@@ -112,7 +112,7 @@
long count = ownersCommitteeService.count(Wrappers.<OwnersCommitteeMemberEntity>lambdaQuery()
.eq(OwnersCommitteeMemberEntity::getAreaId, ownersCommittee.getAreaId())
.eq(OwnersCommitteeMemberEntity::getUserId, ownersCommittee.getUserId()));
- if (count > 0) {
+ if (count > 0 && ownersCommittee.getId() != null) {
return R.fail("该业委会成员已存在");
}
return R.status(ownersCommitteeService.saveOrUpdate(ownersCommittee));
--
Gitblit v1.9.3