Merge remote-tracking branch 'origin/master'

linwei

2024-01-02 31b6aefacbee9dde61be6afcb7c6dbbf7c6baa7d

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

@@ -19,6 +19,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.logging.log4j.util.Strings;
import org.springblade.common.node.TreeStringNode;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.secure.utils.AuthUtil;
@@ -28,6 +29,8 @@
import org.springblade.modules.house.excel.HouseHoldExcel;
import org.springblade.modules.house.mapper.HouseholdMapper;
import org.springblade.modules.house.service.IHouseholdService;
import org.springblade.modules.house.service.IUserHouseLabelService;
import org.springblade.modules.house.vo.HouseholdLabelVO;
import org.springblade.modules.house.vo.HouseholdOtherVO;
import org.springblade.modules.house.vo.HouseholdVO;
import org.springblade.modules.system.entity.Dept;
@@ -53,7 +56,7 @@
public class HouseholdServiceImpl extends ServiceImpl<HouseholdMapper, HouseholdEntity> implements IHouseholdService {

   @Autowired
   private IGridService gridService;
   private IUserHouseLabelService userHouseLabelService;

   @Autowired
   private IDictBizService dictBizService;
@@ -143,15 +146,8 @@
    * @return
    */
   @Override
   public boolean saveOrUpdateHousehold(HouseholdEntity household) {
      // 判断添加人是否房屋业主
//      Long count = count(Wrappers.<HouseholdEntity>lambdaQuery()
//         .eq(HouseholdEntity::getHouseCode, household.getHouseCode())
//         .eq(HouseholdEntity::getAssociatedUserId, AuthUtil.getUserId())
//         .eq(HouseholdEntity::getRelationship, 1));
//      if (count == 0) {
//         return false;
//      }
   @Transactional(rollbackFor = Exception.class)
   public boolean saveOrUpdateHousehold(HouseholdVO household) {
      boolean flag = false;
      household.setUpdateTime(new Date());
      household.setUpdateUser(AuthUtil.getUserId());
@@ -160,6 +156,8 @@
         flag = updateById(household);
         // 更新用户信息
         updateUserInfo(household);
         // 更新标签信息
         updateUserLabelInfo(household);
      } else {
         // 新增
         household.setCreateTime(new Date());
@@ -167,11 +165,31 @@
         flag = save(household);
         // 更新用户信息
         updateUserInfo(household);
         // 更新标签信息
         updateUserLabelInfo(household);
      }
      return flag;
   }

   /**
    * 更新用户标签信息
    * @param household
    */
   public void updateUserLabelInfo(HouseholdVO household) {
      if (household.getHouseholdLabelList().size()>0){
         List<HouseholdLabelVO> householdLabelList = household.getHouseholdLabelList();
         for (HouseholdLabelVO householdLabelVO : householdLabelList) {
            if (!Strings.isBlank(household.getHouseCode())) {
               householdLabelVO.setHouseCode(household.getHouseCode());
            }
            householdLabelVO.setHouseholdId(household.getId());
            // 先删除对应绑定的信息
            userHouseLabelService.saveOrUpdateHouseholdLabel(householdLabelVO);
         }
      }
   }

   /**
    * 更新用户信息
    * @param household
    */