Merge remote-tracking branch 'origin/master'

lin

2024-03-21 98222128889b7943d02bfa6a9bd09782cb2bfbcb

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

@@ -246,16 +246,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 +282,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());
            }
         }
@@ -307,6 +305,7 @@
                     userService.updateById(userVO);
                  } else {
                     // 没有其他角色
                     userVO.setRoleId(null);
                     userService.removeById(userVO.getId());
                  }
               }
@@ -319,12 +318,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 +334,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 +345,7 @@
         }
         // 更新用户
         save = userService.updateById(user);
         return save;
         return user;
      }
      // 新增用户
      user.setAccount(householdEntity.getPhoneNumber());
@@ -355,7 +356,7 @@
      user.setPassword(DigestUtil.encrypt(CommonConstant.DEFAULT_PASSWORD));
      user.setRoleId("1717429059648606209");
      save = userService.save(user);
      return save;
      return user;
   }

   /**