登录添加字段+租户添加用户

lin

2024-03-19 0aee607bb63864400e35cd6980e600ba5aae8c45

 src/main/java/org/springblade/modules/house/service/impl/HouseRentalServiceImpl.java

@@ -21,10 +21,11 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.logging.log4j.util.Strings;
import org.springblade.common.cache.SysCache;
import org.springblade.common.constant.CommonConstant;
import org.springblade.common.param.CommonParamSet;
import org.springblade.common.utils.SpringUtils;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.utils.DigestUtil;
import org.springblade.modules.grid.service.IGridService;
import org.springblade.modules.house.entity.HouseRentalEntity;
import org.springblade.modules.house.entity.HouseholdEntity;
@@ -36,9 +37,7 @@
import org.springblade.modules.house.vo.HouseRentalTenantVO;
import org.springblade.modules.house.vo.HouseRentalVO;
import org.springblade.modules.house.vo.HouseholdVO;
import org.springblade.modules.system.entity.Dept;
import org.springblade.modules.system.entity.User;
import org.springblade.modules.system.service.IDeptService;
import org.springblade.modules.system.service.IUserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -234,17 +233,32 @@
      List<HouseholdEntity> addList = new ArrayList<>();
      List<HouseholdEntity> updateList = new ArrayList<>();
      List<HouseholdEntity> removeList = new ArrayList<>();
      List<User> addUserList = new ArrayList<>();
//      List<User> updateUserList = new ArrayList<>();
//      List<User> removeUserList = new ArrayList<>();
      // 找出需要新增的，否则组成新集合进行比对
      List<String> phoneList = new ArrayList<>();

      IUserService userService = SpringUtils.getBean(IUserService.class);
      for (HouseholdEntity householdEntity : list) {
         if (null == householdEntity.getId()) {
            // 新增
            // 新增用戶
            User user = new User();
            user.setAccount(householdEntity.getPhoneNumber());
            user.setUserType(1);
            user.setRealName(householdEntity.getName());
            user.setName(householdEntity.getName());
            user.setPassword(DigestUtil.encrypt(CommonConstant.DEFAULT_PASSWORD));
            user.setRoleId("1717429059648606209");
            boolean save = userService.save(user);
            // 新增住户
            householdEntity.setHouseCode(houseRental.getHouseCode());
            householdEntity.setHousingRentalId(houseRental.getId());
            householdEntity.setRelationship(18);
            householdEntity.setResidentialStatus(1);
            householdEntity.setRoleType(2);
            if (save) {
               householdEntity.setAssociatedUserId(user.getId());
            }
            addList.add(householdEntity);
            phoneList.add(householdEntity.getPhoneNumber());
         } else {