修改bug

blade-service/blade-client/src/main/java/org/springblade/client/affairs/controller/AffairsController.java

@@ -1,6 +1,7 @@
 package org.springblade.client.affairs.controller;
 
 import com.alibaba.cloud.commons.lang.StringUtils;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.annotations.Api;
@@ -12,6 +13,7 @@ import org.springblade.client.goods.enums.GoodsTypeEnum;
 import org.springblade.client.goods.service.IGoodsDescService;
 import org.springblade.client.vo.GoodsDescVO;
 import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.utils.AuthUtil;
@@ -108,6 +110,18 @@ public class AffairsController extends BladeController {
 	@ApiOperationSupport(order = 6)
 	@ApiOperation(value = "新增或修改", notes = "传入goodsDesc")
 	public R submit(@Valid @RequestBody GoodsDesc goodsDesc) {
+		 //验证唯一性
+		LambdaQueryWrapper<GoodsDesc> lambdaQueryWrapper=new LambdaQueryWrapper<>();
+		lambdaQueryWrapper.eq(GoodsDesc::getCode,goodsDesc.getCode());
+		lambdaQueryWrapper.eq(GoodsDesc::getCname,goodsDesc.getCname());
+		lambdaQueryWrapper.eq(GoodsDesc::getType,1);
+		int count = goodsDescService.count(lambdaQueryWrapper);
+		if(count>0)
+		{
+			throw new ServiceException("存在重复数据,请修改后添加");
+		}
+
+
 		if (StringUtils.isBlank(goodsDesc.getTenantId())) {
 			goodsDesc.setTenantId(AuthUtil.getTenantId());
 		}

blade-service/blade-client/src/main/java/org/springblade/client/goods/service/impl/GoodsDescServiceImpl.java

@@ -179,6 +179,7 @@ public class GoodsDescServiceImpl extends ServiceImpl<GoodsDescMapper, GoodsDesc
 	public void modify(GoodsDesc goodsDesc)
 	{
 		LambdaQueryWrapper<GoodsDesc> lambdaQueryWrapper=new LambdaQueryWrapper<>();
+		lambdaQueryWrapper.eq(GoodsDesc::getType,0);
 		lambdaQueryWrapper.eq(GoodsDesc::getCode,goodsDesc.getCode());
 		lambdaQueryWrapper.eq(GoodsDesc::getCname,goodsDesc.getCname());
 		int count = baseMapper.selectCount(lambdaQueryWrapper);