增加校验

icssman-service/src/main/java/com/diagbot/facade/VersionDetailFacade.java

@@ -15,11 +15,13 @@ import com.diagbot.client.UserServiceClient;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.VersionDetailDTO;
 import com.diagbot.entity.VersionDetail;
+import com.diagbot.entity.VersionInfo;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.enums.StatusEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.VersionDetailServiceImpl;
+import com.diagbot.service.impl.VersionInfoServiceImpl;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.UserUtils;
 import com.diagbot.vo.VersionDetailIdVO;
@@ -40,6 +42,8 @@ public class VersionDetailFacade extends VersionDetailServiceImpl {
     VersionDetailServiceImpl versionDetailServiceImpl;
     @Autowired
     UserServiceClient userServiceClient;
+    @Autowired
+    VersionInfoServiceImpl versionInfoServiceImpl;
 
     /**
      * 根据版本id查询版本详情
@@ -131,8 +135,8 @@ public class VersionDetailFacade extends VersionDetailServiceImpl {
         // 1.先判断数据是否存在有效
         QueryWrapper<VersionDetail> VersionInfoFand = new QueryWrapper<>();
         VersionInfoFand.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("id", versionDetailVO.getDetailId());
-        VersionDetail data = getOne(VersionInfoFand);
-        if (data == null) {
+        int sum = count(VersionInfoFand);
+        if (sum == 0) {
             throw new CommonException(CommonErrorCode.NOT_EXISTS, "该数据不存在");
         }
         // 2.修改版本详情信息
@@ -161,6 +165,13 @@ public class VersionDetailFacade extends VersionDetailServiceImpl {
      * @return
      */
     public boolean cancelVersionDetail(VersionDetailIdVO versionDetailIdVO) {
+    	 // 1.先判断数据是否存在有效
+        QueryWrapper<VersionDetail> VersionInfoFand = new QueryWrapper<>();
+        VersionInfoFand.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("id", versionDetailIdVO.getId());
+        int sum = count(VersionInfoFand);
+        if (sum == 0) {
+            throw new CommonException(CommonErrorCode.NOT_EXISTS, "该数据不存在");
+        }
         UpdateWrapper<VersionDetail> versionDetailNew = new UpdateWrapper<>();
         versionDetailNew.in("id", versionDetailIdVO.getId()).eq("is_deleted", IsDeleteEnum.N.getKey()).set("is_deleted",
                 IsDeleteEnum.Y.getKey()).set("modifier", UserUtils.getCurrentPrincipleID()).set("gmt_modified", DateUtil.now());
@@ -175,6 +186,14 @@ public class VersionDetailFacade extends VersionDetailServiceImpl {
      */
     public boolean addVersionDetail(VersionInfoAndDetailIdVO versionInfoAndDetailIdVO) {
 
+    	//1.增加明细前先判断主版本号的id是否有效
+        QueryWrapper<VersionInfo> VersionInfoFand = new QueryWrapper<>();
+        VersionInfoFand.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("id", versionInfoAndDetailIdVO.getVersionInfoId());
+        int sum = versionInfoServiceImpl.count(VersionInfoFand);
+        if (sum == 0) {
+            throw new CommonException(CommonErrorCode.NOT_EXISTS, "主版本号数据不存在");
+        }
+        
         List<VersionDetail> dataNew = new ArrayList<VersionDetail>();
         List<VersionDetailVO> datas = versionInfoAndDetailIdVO.getVersionDetail();
         for (VersionDetailVO data : datas) {

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

@@ -225,6 +225,13 @@ public class VersionInfoFacade extends VersionInfoServiceImpl {
      * @return
      */
     public boolean cancelVersionInfoAll(VersionInfoIdVO versionInfoVO) {
+    	 // 1.先判断数据是否存在有效
+        QueryWrapper<VersionInfo> VersionInfoFand = new QueryWrapper<>();
+        VersionInfoFand.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("id", versionInfoVO.getId());
+        int sum = count(VersionInfoFand);
+        if (sum == 0) {
+            throw new CommonException(CommonErrorCode.NOT_EXISTS, "该数据不存在");
+        }
         UpdateWrapper<VersionInfo> versionInfoNew = new UpdateWrapper<>();
         versionInfoNew.in("id", versionInfoVO.getId()).eq("is_deleted", IsDeleteEnum.N.getKey())
                 .set("is_deleted", IsDeleteEnum.Y.getKey()).set("modifier", UserUtils.getCurrentPrincipleID())