lin
2024-03-16 477953629ecf2503ea119c905597d3f236e4530e
bug修复
2 files modified
18 ■■■■■ changed files
src/main/java/org/springblade/modules/house/entity/UserHouseLabelEntity.java 1 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/house/service/impl/UserHouseLabelServiceImpl.java 17 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/house/entity/UserHouseLabelEntity.java
@@ -83,6 +83,7 @@
    @TableField("household_id")
    private Long householdId;
    @ApiModelProperty(value = "创建时间", example = "")
    @TableField(value = "create_time",fill = FieldFill.INSERT)
    private Date createTime;
src/main/java/org/springblade/modules/house/service/impl/UserHouseLabelServiceImpl.java
@@ -103,21 +103,24 @@
    /**
     * 房屋-标签 房屋自定义新增或修改
     * @param householdLabel
     *
     * @param userHouseLabelEntity
     * @return
     */
    @Override
    public boolean saveOrUpdateHouseLabel(UserHouseLabelEntity householdLabel) {
    public boolean saveOrUpdateHouseLabel(UserHouseLabelEntity userHouseLabelEntity) {
        // 查询标签名称
        LabelEntity labelEntity = labelService.getById(householdLabel.getLabelId());
        householdLabel.setLabelName(labelEntity.getLabelName());
        LabelEntity labelEntity = labelService.getById(userHouseLabelEntity.getLabelId());
        if (labelEntity != null) {
            userHouseLabelEntity.setLabelName(labelEntity.getLabelName());
        }
        // 先删除之前的房屋绑定的标签
        QueryWrapper<UserHouseLabelEntity> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("house_code",householdLabel.getHouseCode())
            .eq("lable_type",2);
        queryWrapper.eq("house_code", userHouseLabelEntity.getHouseCode())
            .eq("lable_type", 2);
        // 删除
        remove(queryWrapper);
        // 插入
        return save(householdLabel);
        return save(userHouseLabelEntity);
    }
}