From 8b7258c9427882bb1798f1502eaa35184c6e374e Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 09 Aug 2024 14:29:18 +0800
Subject: [PATCH] 短信指定楼栋发送
---
src/main/java/org/springblade/modules/house/service/impl/HouseRentalServiceImpl.java | 19 ++++++-------------
1 files changed, 6 insertions(+), 13 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 9e1cac4..456d393 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
@@ -192,16 +192,9 @@
User newUser = new User();
if (null != householdEntity.getPhoneNumber() && !householdEntity.getPhoneNumber().equals("")) {
//根据手机号查询库里的数据
- User userParams = new User();
- userParams.setPhone(householdEntity.getPhoneNumber());
- User user = userService.getOne(Condition.getQueryWrapper(userParams));
- if (null == user) {
- User userParams1 = new User();
- userParams1.setAccount(householdEntity.getPhoneNumber());
- userParams1.setIsDeleted(0);
- user = userService.getOne(Condition.getQueryWrapper(userParams1));
- }
- if (null != user) {
+ List<User> list = userService.getUserListByPhoneOrAccount(householdEntity.getPhoneNumber());
+ if (list.size()>0) {
+ User user = list.get(0);
//如果用户存在，则该用户id绑定场所
householdEntity.setAssociatedUserId(user.getId());
//更新住户信息
@@ -382,7 +375,7 @@
// 查询该住户是否有账号
IUserService userService1 = SpringUtils.getBean(IUserService.class);
User user1 = userService1.getOne(Wrappers.<User>lambdaQuery()
- .eq(User::getPhone, householdEntity.getPhoneNumber())
+ .eq(User::getAccount, householdEntity.getPhoneNumber())
.eq(User::getIsDeleted, 0).last("limit 1"));
if (user1 != null) {
user = user1;
@@ -458,7 +451,7 @@
@Override
public Integer getStatisticsCount(HouseRentalTenantVO houseRental) {
CommonParamSet<Object> commonParamSet = new CommonParamSet<>().invoke(HouseRentalTenantVO.class, houseRental);
- return baseMapper.getStatisticsCount(houseRental, commonParamSet.getGridCodeList(),
- commonParamSet.getRegionChildCodesList(), commonParamSet.getIsAdministrator());
+ return baseMapper.getStatisticsCount(houseRental, commonParamSet.getRegionChildCodesList(),
+ commonParamSet.getGridCodeList(), commonParamSet.getIsAdministrator());
}
}
--
Gitblit v1.9.3