diff --git a/src/main/java/com/sqx/modules/material/entity/Material.java b/src/main/java/com/sqx/modules/material/entity/Material.java index c108f67..2102b56 100644 --- a/src/main/java/com/sqx/modules/material/entity/Material.java +++ b/src/main/java/com/sqx/modules/material/entity/Material.java @@ -1,6 +1,7 @@ package com.sqx.modules.material.entity; import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; @@ -12,6 +13,7 @@ import java.util.Date; /** * 物料包表 */ +@TableName(value ="material") @Data public class Material implements Serializable { private String id; diff --git a/src/main/java/com/sqx/modules/material/service/impl/MaterialServiceImpl.java b/src/main/java/com/sqx/modules/material/service/impl/MaterialServiceImpl.java index e2e09e2..121a6d9 100644 --- a/src/main/java/com/sqx/modules/material/service/impl/MaterialServiceImpl.java +++ b/src/main/java/com/sqx/modules/material/service/impl/MaterialServiceImpl.java @@ -82,7 +82,7 @@ public class MaterialServiceImpl extends ServiceImpl i materialQueryWrapper.eq("goods_id", material.getGoodsId()); // 根据查询封装器查询物料按摩信息 Material materials = baseMapper.selectOne(materialQueryWrapper); - if(!materials.getId().equals(material.getId()) ){ + if(materials!=null && !materials.getId().equals(material.getId()) ){ return Result.error("当前商品已绑定物料包,请重新选择!"); } return Result.success().put("data",materialMapper.insertIgnoreNull(material)); @@ -106,14 +106,14 @@ public class MaterialServiceImpl extends ServiceImpl i */ public Result updateIgnoreNull(Material material) { material.setUpdateTime(new Date()); - QueryWrapper materialQueryWrapper = new QueryWrapper(); - // 设置查询条件,根据物料ID查询物料按摩信息 - materialQueryWrapper.eq("goods_id", material.getGoodsId()); - // 根据查询封装器查询物料按摩信息 - Material materials = baseMapper.selectOne(materialQueryWrapper); - if(ObjectUtil.isNotEmpty(materials) && !materials.getId().equals(material.getId()) ){ - return Result.error("当前商品已绑定物料包,请重新选择!"); - } +// QueryWrapper materialQueryWrapper = new QueryWrapper(); +// // 设置查询条件,根据物料ID查询物料按摩信息 +// materialQueryWrapper.eq("goods_id", material.getGoodsId()); +// // 根据查询封装器查询物料按摩信息 +// Material materials = baseMapper.selectOne(materialQueryWrapper); +// if(ObjectUtil.isNotEmpty(materials) && !materials.getId().equals(material.getId()) ){ +// return Result.error("当前商品已绑定物料包,请重新选择!"); +// } return Result.success().put("data",materialMapper.updateIgnoreNull(material)); }