车主注册查询问题，人员管理删除用户时删除车主关联表中的数据

blade-service/blade-user/src/main/java/org/springblade/system/user/feign/UserClient.java

@@ -90,6 +90,7 @@ public class UserClient implements IUserClient {
 			.eq(CarOwner::getCarOwnerPhone, user.getPhone())
 			.eq(CarOwner::getDealerId, shopAppCorpsDescVO.getSrcDistributorId())
 			.eq(CarOwner::getStoreId, userInfoById.getId())
+			.eq(CarOwner::getIsDeleted, 0)
 			.last("LIMIT 1"));
 		if (carOwner != null) {
 			carOwner.setUpdateUserName(AuthUtil.getUserName());
@@ -372,6 +373,9 @@ public class UserClient implements IUserClient {
 	@Override
 	public UserInfo getUserInfoByPhone(String phone, String category) {
 		UserInfo userInfo = service.getUserInfoByPhone(phone, category);
+		if (org.springframework.util.ObjectUtils.isEmpty(userInfo)) {
+			return userInfo;
+		}
 		List<CarOwner> carOwnerList = carOwnerService.list(new LambdaQueryWrapper<CarOwner>()
 			.eq(CarOwner::getUserId, userInfo.getUser().getId())
 			.eq(CarOwner::getIsDeleted, 0));

blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java

@@ -324,10 +324,14 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
 
 	@Override
 	public boolean removeUser(String userIds) {
-		if (Func.contains(Func.toLongArray(userIds), AuthUtil.getUserId())) {
+		BladeUser delUser = AuthUtil.getUser();
+		if (Func.contains(Func.toLongArray(userIds), delUser.getUserId())) {
 			throw new ServiceException("不能删除本账号!");
 		}
-		return deleteLogic(Func.toLongList(userIds));
+		// TODO: 后续要按门店删除
+		List<Long> userIdList = Func.toLongList(userIds);
+		carOwnerService.remove(new LambdaQueryWrapper<CarOwner>().in(CarOwner::getUserId, userIdList));
+		return deleteLogic(userIdList);
 	}
 
 	@Override