From fbcd5b74703abf2b3906e55cfff8c5fa30de34d3 Mon Sep 17 00:00:00 2001 From: lifenlong Date: Thu, 17 Jun 2021 00:28:36 +0800 Subject: [PATCH] =?UTF-8?q?app=E7=89=88=E6=9C=AC=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=EF=BC=8C=E8=BF=87=E6=BB=A4=E5=BD=93=E5=89=8D=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/system/serviceimpl/AppVersionServiceImpl.java | 5 ++++- .../controller/other/broadcast/StudioManagerController.java | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/framework/src/main/java/cn/lili/modules/system/serviceimpl/AppVersionServiceImpl.java b/framework/src/main/java/cn/lili/modules/system/serviceimpl/AppVersionServiceImpl.java index 45a31a10..bf6e05ec 100644 --- a/framework/src/main/java/cn/lili/modules/system/serviceimpl/AppVersionServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/system/serviceimpl/AppVersionServiceImpl.java @@ -2,6 +2,7 @@ package cn.lili.modules.system.serviceimpl; import cn.lili.common.enums.ResultCode; import cn.lili.common.exception.ServiceException; +import cn.lili.modules.goods.entity.dos.Brand; import cn.lili.modules.system.entity.dos.AppVersion; import cn.lili.modules.system.mapper.AppVersionMapper; import cn.lili.modules.system.service.AppVersionService; @@ -29,7 +30,9 @@ public class AppVersionServiceImpl extends ServiceImpl().eq(AppVersion::getVersion,appVersion.getVersion()))){ + if (null != this.getOne(new LambdaQueryWrapper() + .eq(AppVersion::getVersion, appVersion.getVersion()) + .ne(appVersion.getId() != null, AppVersion::getId, appVersion.getId()))) { throw new ServiceException(ResultCode.APP_VERSION_EXIST); } return true; diff --git a/manager-api/src/main/java/cn/lili/controller/other/broadcast/StudioManagerController.java b/manager-api/src/main/java/cn/lili/controller/other/broadcast/StudioManagerController.java index 9436e196..d510874d 100644 --- a/manager-api/src/main/java/cn/lili/controller/other/broadcast/StudioManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/other/broadcast/StudioManagerController.java @@ -42,7 +42,7 @@ public class StudioManagerController { @ApiOperation(value = "获取店铺直播间详情") @ApiImplicitParam(name = "studioId", value = "直播间ID", required = true, paramType = "path") - @GetMapping("/studioInfo/{studioId}") + @GetMapping("/{studioId}") public ResultMessage studioInfo(@PathVariable String studioId) { return ResultUtil.data(studioService.getStudioVO(studioId)); }