From e56c20469dd8c6b05c977d6134f00abd4e018d57 Mon Sep 17 00:00:00 2001
From: lele0521 <lele190626@gmail.com>
Date: Thu, 21 Mar 2024 13:42:58 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20APP=E7=89=88=E6=9C=AC=E6=8E=A7=E5=88=B6?=
 =?UTF-8?q?=E5=8C=BA=E5=88=86APP=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cn/lili/common/enums/ResultCode.java |  3 +++
 .../system/serviceimpl/AppVersionServiceImpl.java      | 10 +++++++++-
 .../controller/other/AppVersionManagerController.java  |  1 -
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/framework/src/main/java/cn/lili/common/enums/ResultCode.java b/framework/src/main/java/cn/lili/common/enums/ResultCode.java
index a648110c..3327fea4 100644
--- a/framework/src/main/java/cn/lili/common/enums/ResultCode.java
+++ b/framework/src/main/java/cn/lili/common/enums/ResultCode.java
@@ -496,6 +496,9 @@ public enum ResultCode {
     WECHAT_MP_MESSAGE_TMPL_ERROR(80306, "未能获取到微信模版消息id"),
     WECHAT_ERROR(80307, "微信接口异常"),
     APP_VERSION_EXIST(80307, "APP版本已存在"),
+    APP_VERSION_PARAM_ERROR(80308, "添加APP版本参数异常"),
+    // 未选择APP类型
+    APP_VERSION_TYPE_ERROR(80308, "请选择有效的APP类型"),
 
     /**
      * IM
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 b4b67392..ce52c9f4 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.common.utils.StringUtils;
 import cn.lili.modules.system.entity.dos.AppVersion;
 import cn.lili.modules.system.mapper.AppVersionMapper;
 import cn.lili.modules.system.service.AppVersionService;
@@ -26,9 +27,16 @@ public class AppVersionServiceImpl extends ServiceImpl<AppVersionMapper, AppVers
 
     @Override
     public boolean checkAppVersion(AppVersion appVersion) {
-        //检测版本是否存在
+        if (null == appVersion) {
+            throw new ServiceException(ResultCode.APP_VERSION_PARAM_ERROR);
+        }
+        if (StringUtils.isBlank(appVersion.getType())) {
+            throw new ServiceException(ResultCode.APP_VERSION_TYPE_ERROR);
+        }
+        //检测版本是否存在（同类型APP下版本不允许重复）
         if (null != this.getOne(new LambdaQueryWrapper<AppVersion>()
                 .eq(AppVersion::getVersion, appVersion.getVersion())
+                .eq(AppVersion::getType, appVersion.getType())
                 .ne(appVersion.getId() != null, AppVersion::getId, appVersion.getId()))) {
             throw new ServiceException(ResultCode.APP_VERSION_EXIST);
         }
diff --git a/manager-api/src/main/java/cn/lili/controller/other/AppVersionManagerController.java b/manager-api/src/main/java/cn/lili/controller/other/AppVersionManagerController.java
index 49dea11c..a2fdecf2 100644
--- a/manager-api/src/main/java/cn/lili/controller/other/AppVersionManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/other/AppVersionManagerController.java
@@ -63,7 +63,6 @@ public class AppVersionManagerController {
             @ApiImplicitParam(name = "id", value = "主键", required = true, dataType = "String", paramType = "path")
     })
     public ResultMessage<Object> edit(@Valid AppVersion appVersion, @PathVariable String id) {
-
         if(this.appVersionService.checkAppVersion(appVersion)){
             if(this.appVersionService.updateById(appVersion)){
                 return ResultUtil.success();