短信指定楼栋发送

linwe

2024-08-09 8b7258c9427882bb1798f1502eaa35184c6e374e

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

@@ -455,7 +455,7 @@
            }
         }
         // 判断是否租户导入
      if (StringUtils.isNotBlank(isTenant) || householdEntity.getRelationship() == 18) {
      if (StringUtils.isNotBlank(isTenant) || (householdEntity.getRelationship() != null && householdEntity.getRelationship() == 18)) {
         householdEntity.setRelationship(18);
         HouseRentalEntity houseRentalEntity = iHouseRentalService.getOne(Wrappers.<HouseRentalEntity>lambdaQuery()
            .eq(HouseRentalEntity::getHouseCode, householdEntity.getHouseCode()).last("limit 1"));
@@ -619,8 +619,8 @@
      HouseholdVO householdVO = new HouseholdVO();
      householdVO.setConfirmFlag(confirmFlag);
      householdVO.setCommunityCode(neiCode);
      householdVO.setUserId(AuthUtil.getUserId());
      CommonParamSet commonParamSet = new CommonParamSet().invoke(HouseholdVO.class, householdVO);

      return baseMapper.statistics(householdVO, commonParamSet.getIsAdministrator(),
         commonParamSet.getRegionChildCodesList(), commonParamSet.getGridCodeList());
   }
@@ -743,7 +743,7 @@
      for (Long id : idList) {
         HouseholdEntity householdEntity = getById(id);
         // 如果是业主
         if (null!= householdEntity.getRelationship() && householdEntity.getRelationship() == 1) {
         if (null != householdEntity && null != householdEntity.getRelationship() && householdEntity.getRelationship() == 1) {
            // 查询对应的用户
            User user = userService.getById(householdEntity.getAssociatedUserId());
            // 判断是否还绑定其他的房屋，如果有，则不操作用户
@@ -809,13 +809,18 @@
    */
   @Override
   public List<HouseholdVO> selectHouseholdList(HouseholdVO household) {
      if (household.getLimit() == null) {
         household.setLimit(20);
      }
      List<HouseholdVO> householdVOS = baseMapper.selectHouseholdList(household);
      // 遍历
      for (HouseholdVO householdVO : householdVOS) {
         if (householdVO.getHouseholdLabelList().size() > 0) {
            List<String> labelNameList = householdVO.getHouseholdLabelList().stream().map(householdLabelVO -> householdLabelVO.getLabelName())
               .collect(Collectors.toList());
            householdVO.setLabelName(String.join(",", labelNameList));
         List<HouseholdLabelVO> householdLabelList = householdVO.getHouseholdLabelList();
         if (!householdLabelList.isEmpty()) {
            String labelName = householdLabelList.stream()
               .map(HouseholdLabelVO::getLabelName)
               .collect(Collectors.joining(","));
            householdVO.setLabelName(labelName);
         }
      }
      // 返回