From 0a7f15457a9c44d5ef19a3234306e84dabbe4fd2 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Thu, 21 Mar 2024 12:55:25 +0800
Subject: [PATCH] 租客

---
 src/main/java/org/springblade/modules/house/service/impl/HouseRentalServiceImpl.java |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/springblade/modules/house/service/impl/HouseRentalServiceImpl.java b/src/main/java/org/springblade/modules/house/service/impl/HouseRentalServiceImpl.java
index 03aa9c4..7891de7 100644
--- a/src/main/java/org/springblade/modules/house/service/impl/HouseRentalServiceImpl.java
+++ b/src/main/java/org/springblade/modules/house/service/impl/HouseRentalServiceImpl.java
@@ -39,7 +39,9 @@
 import org.springblade.modules.house.vo.HouseRentalVO;
 import org.springblade.modules.house.vo.HouseholdVO;
 import org.springblade.modules.system.entity.User;
+import org.springblade.modules.system.entity.UserInfo;
 import org.springblade.modules.system.service.IUserService;
+import org.springblade.modules.system.vo.UserDetailVO;
 import org.springblade.modules.system.vo.UserVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -295,7 +297,7 @@
 			// 删除用户。判断用户是否有其他角色,
 			for (HouseholdEntity householdEntity : removeList) {
 				if (householdEntity.getAssociatedUserId() != null) {
-					UserVO userVO = userService.getuserById(householdEntity.getAssociatedUserId());
+					User userVO = userService.getById(householdEntity.getAssociatedUserId());
 					if (userVO.getRoleId().contains("1717429059648606209")) {
 						List<String> stringList = Arrays.asList(userVO.getRoleId().split(","));
 						// 有其他角色
@@ -305,8 +307,9 @@
 							userService.updateById(userVO);
 						} else {
 							// 没有其他角色
-							userVO.setRoleId(null);
-							userService.removeById(userVO.getId());
+							userVO.setRoleId("");
+							boolean b = userService.updateById(userVO);
+							System.out.println(b);
 						}
 					}
 				}

--
Gitblit v1.9.3