wangli/tyr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/feature/REQ-1102' into feature/REQ-1102

Browse Source
This commit is contained in:
yangsong 2023-09-18 10:21:39 +08:00
commit fa52425b59
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tyr-api/src/main/java/cn/axzo/tyr/client/model/product/ProductUpdateReq.java
View File

@ -23,7 +23,7 @@ public class ProductUpdateReq {
* 产品 ID
*/
@NotNull(message = "产品 ID 不能为空")
private String id;
private Long id;
/**
* 产品名称

7
tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/ProductServiceImpl.java
View File

@ -76,9 +76,12 @@ public class ProductServiceImpl implements ProductService {
@Override
public ApiResult<ProductVO> update(ProductUpdateReq req) {
Optional<ProductModule> optProduct = productModuleDao.lambdaQuery()
.eq(ProductModule::getProductName, req.getProductName())
.eq(ProductModule::getDictWorkspaceTypeId, req.getDictWorkspaceTypeId())
.oneOpt();
AssertUtil.isTrue(!optProduct.isPresent() || Objects.equals(req.getId(), optProduct.get().getId()), "产品名称在相同工作台类型下不允许重复");
ProductModule productModule = productModuleDao.getById(req.getId());
AssertUtil.isTrue(Objects.equals(req.getProductName(), productModule.getProductName())
&& Objects.equals(req.getDictWorkspaceTypeId(), productModule.getDictWorkspaceTypeId()), "产品名称在相同工作台类型下不允许重复");
BeanMapper.copyBeanIgnoreNull(req, () -> productModule);
productModuleDao.updateById(productModule);
return ApiResult.ok(BeanMapper.copyBeanIgnoreNull(productModule, ProductVO.class));