瀏覽代碼

Merge remote-tracking branch 'origin/dev/icss' into debug

wangfeng 6 年之前
父節點
當前提交
004bcad068
共有 1 個文件被更改,包括 1 次插入1 次删除
  1. 1 1
      icssman-service/src/main/java/com/diagbot/facade/VersionInfoFacade.java

+ 1 - 1
icssman-service/src/main/java/com/diagbot/facade/VersionInfoFacade.java

@@ -187,7 +187,7 @@ public class VersionInfoFacade extends VersionInfoServiceImpl {
         QueryWrapper<VersionInfo> templateInfoFand = new QueryWrapper<>();
         QueryWrapper<VersionInfo> templateInfoFand = new QueryWrapper<>();
         templateInfoFand.eq("name", versionInfoVO.getName()).eq("is_deleted", IsDeleteEnum.N.getKey());
         templateInfoFand.eq("name", versionInfoVO.getName()).eq("is_deleted", IsDeleteEnum.N.getKey());
         VersionInfo dataInfo = getOne(templateInfoFand);
         VersionInfo dataInfo = getOne(templateInfoFand);
-        if (dataInfo != null) {
+        if (dataInfo != null && !dataInfo.getId().equals(versionInfoVO.getId())) {
             throw new CommonException(CommonErrorCode.NOT_EXISTS, "该版本号已存在");
             throw new CommonException(CommonErrorCode.NOT_EXISTS, "该版本号已存在");
         }
         }
         // 3.修改版本信息
         // 3.修改版本信息