From b5837609dcd4417904eaaa5924de46010443affd Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Thu, 21 Mar 2024 19:37:45 +0800
Subject: [PATCH] 居住证审核+从业人员优化
---
src/main/java/org/springblade/modules/house/service/impl/HouseRentalServiceImpl.java | 26 +++++++++++++++-----------
1 files changed, 15 insertions(+), 11 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 6ae6bc9..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;
@@ -246,16 +248,14 @@
if (null == householdEntity.getId()) {
User user = new User();
// 新增或更新用户
- boolean save = isSave(userService, householdEntity, user);
+ user = isSave(userService, householdEntity, user);
// 新增住户
householdEntity.setHouseCode(houseRental.getHouseCode());
householdEntity.setHousingRentalId(houseRental.getId());
householdEntity.setRelationship(18);
householdEntity.setResidentialStatus(1);
-// householdEntity.setIdCard(houseRental.getid);
householdEntity.setRoleType(2);
-// householdEntity.setName();
- if (save) {
+ if (user.getId() != null) {
householdEntity.setAssociatedUserId(user.getId());
}
addList.add(householdEntity);
@@ -284,8 +284,8 @@
phoneList.add(householdEntity.getPhoneNumber());
User user = new User();
// 修改用户，用户存在则更新用户，不存在则新增用户
- boolean save = isSave(userService, householdEntity, user);
- if (save) {
+ user = isSave(userService, householdEntity, user);
+ if (user.getId() != null) {
householdEntity.setAssociatedUserId(user.getId());
}
}
@@ -297,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(","));
// 有其他角色
@@ -307,7 +307,9 @@
userService.updateById(userVO);
} else {
// 没有其他角色
- userService.removeById(userVO.getId());
+ userVO.setRoleId("");
+ boolean b = userService.updateById(userVO);
+ System.out.println(b);
}
}
}
@@ -319,12 +321,13 @@
/**
* 保存或更新用户
+ *
* @param userService
* @param householdEntity
* @param user
* @return
*/
- private boolean isSave(IUserService userService, HouseholdEntity householdEntity, User user) {
+ private User isSave(IUserService userService, HouseholdEntity householdEntity, User user) {
boolean save;
// 查询该住户是否有账号
IUserService userService1 = SpringUtils.getBean(IUserService.class);
@@ -334,6 +337,7 @@
if (user1 != null) {
user = user1;
user.setName(householdEntity.getName());
+ user.setRealName(householdEntity.getName());
if (StringUtils.isNoneBlank(user.getRoleId())) {
boolean contains = user.getRoleId().contains("1717429059648606209");
if (!contains) {
@@ -344,7 +348,7 @@
}
// 更新用户
save = userService.updateById(user);
- return save;
+ return user;
}
// 新增用户
user.setAccount(householdEntity.getPhoneNumber());
@@ -355,7 +359,7 @@
user.setPassword(DigestUtil.encrypt(CommonConstant.DEFAULT_PASSWORD));
user.setRoleId("1717429059648606209");
save = userService.save(user);
- return save;
+ return user;
}
/**
--
Gitblit v1.9.3