代码逻辑优化

knowledgeman-service/src/main/java/com/diagbot/facade/VersionInfoFacade.java

@@ -203,7 +203,13 @@ public class VersionInfoFacade extends VersionInfoServiceImpl {
      */
     public boolean updateVersionInfoAll(VersionInfoAllVO versionInfoVO) {
         // 1.先判断数据是否存在有效
-        checkExist(versionInfoVO.getId());
+        VersionInfo versionInfoRes = checkExist(versionInfoVO.getId());
+        //验证是否停用
+        if (versionInfoRes != null
+                && StringUtil.isNotBlank(versionInfoRes.getStatus())
+                && versionInfoRes.getStatus().equals(String.valueOf(StatusEnum.Disable.getKey()))) {
+            throw new CommonException(CommonErrorCode.NOT_EXISTS, "该产品该版本号已停用");
+        }
         // 2.判断该版本号是否存在名字相同的数据
         QueryWrapper<VersionInfo> templateInfoFand = new QueryWrapper<>();
         templateInfoFand.eq("product_type", versionInfoVO.getProductType())
@@ -214,11 +220,6 @@ public class VersionInfoFacade extends VersionInfoServiceImpl {
         if (dataInfo != null && !dataInfo.getId().equals(versionInfoVO.getId())) {
             throw new CommonException(CommonErrorCode.NOT_EXISTS, "该产品该版本号已存在");
         }
-        if (dataInfo != null
-                && StringUtil.isNotBlank(dataInfo.getStatus())
-                && dataInfo.getStatus().equals(String.valueOf(StatusEnum.Disable.getKey()))) {
-            throw new CommonException(CommonErrorCode.NOT_EXISTS, "该产品该版本号已停用");
-        }
         // 3.修改版本信息
         VersionInfo versionInfo = new VersionInfo();
         versionInfo.setId(versionInfoVO.getId());// 模板id
@@ -268,15 +269,16 @@ public class VersionInfoFacade extends VersionInfoServiceImpl {
      *
      * @param id
      */
-    private void checkExist(Long id) {
+    private VersionInfo checkExist(Long id) {
         // 1.先判断数据是否存在有效
         QueryWrapper<VersionInfo> VersionInfoFand = new QueryWrapper<>();
         VersionInfoFand.eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("id", id);
-        int sum = count(VersionInfoFand);
-        if (sum == 0) {
+        VersionInfo versionInfo = getOne(VersionInfoFand);
+        if (null == versionInfo) {
             throw new CommonException(CommonErrorCode.NOT_EXISTS, "该数据不存在");
         }
+        return versionInfo;
     }
 
     /**