From 038f3e14174a00a111d489d5cf1b724275fe33da Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Tue, 28 Nov 2023 18:10:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 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 b1222cc..58e3b64 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
@@ -17,7 +17,8 @@
package org.springblade.modules.house.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springblade.common.node.TreeNode;
+import org.apache.logging.log4j.util.Strings;
+import org.springblade.common.node.TreeStringNode;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.modules.house.entity.HouseholdEntity;
@@ -59,7 +60,7 @@
* @return
*/
@Override
- public List<TreeNode> selectHouseNodeList(Long userId) {
+ public List<TreeStringNode> selectHouseNodeList(Long userId) {
return baseMapper.selectHouseNodeList(userId);
}
@@ -115,6 +116,12 @@
// 更新
flag = updateById(household);
}else {
+ // 往用户表中插入数据
+ // 通过手机号判断
+ if (!Strings.isBlank(household.getPhoneNumber())){
+ //判断用户是否存在
+
+ }
// 新增
household.setCreateTime(new Date());
household.setCreateUser(AuthUtil.getUserId());
--
Gitblit v1.9.3