From 922b12a06599bc7118c4759571b9b9fe06a2e63d Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Tue, 28 May 2024 19:43:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java b/src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java
index 62d4377..ef25572 100644
--- a/src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java
+++ b/src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java
@@ -356,7 +356,7 @@
wrapper.eq("house_code", householdEntity.getHouseCode())
.eq("is_deleted", 0)
.eq("name", householdEntity.getName());
- HouseholdEntity one = this.getOne(wrapper);
+ List<HouseholdEntity> list = this.list(wrapper);
// 与角色关系
if (!Strings.isBlank(houseHoldExcel.getRelationship())) {
householdEntity.setRelationship(Integer.parseInt(houseHoldExcel.getRelationship()));
@@ -442,7 +442,7 @@
householdEntity.setMaritalStatus(Integer.parseInt(houseHoldExcel.getMaritalStatus()));
}
- if (one==null){
+ if (list.size()==0){
// 新增
this.save(householdEntity);
importNum++;
@@ -451,13 +451,15 @@
}else {
updateNum++;
if (isCovered){
- // 覆盖更新
- householdEntity.setId(one.getId());
- // 更新
- updateById(householdEntity);
+ for (HouseholdEntity one : list) {
+ // 覆盖更新
+ householdEntity.setId(one.getId());
+ // 更新
+ updateById(householdEntity);
+ // 处理标签
+ handleLabel(householdEntity,houseHoldExcel);
+ }
importNum++;
- // 处理标签
- handleLabel(householdEntity,houseHoldExcel);
}
}
}
--
Gitblit v1.9.3