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

icss-service/src/main/java/com/diagbot/facade/HospitalInfoFacade.java

@@ -3,6 +3,8 @@ package com.diagbot.facade;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.dto.HospitalInfoDTO;
 import com.diagbot.entity.HospitalInfo;
+import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.enums.StatusEnum;
 import com.diagbot.service.impl.HospitalInfoServiceImpl;
 import com.diagbot.vo.HospitalInfoVO;
 import org.springframework.stereotype.Component;
@@ -36,9 +38,9 @@ public class HospitalInfoFacade extends HospitalInfoServiceImpl {
      */
     public HospitalInfo getHospitalByCode(String code) {
         QueryWrapper<HospitalInfo> queryWrapper = new QueryWrapper<HospitalInfo>();
-        queryWrapper.eq("is_deleted", "N");
+        queryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey());
         queryWrapper.eq("code", code);
-        queryWrapper.eq("status", 1);
+        queryWrapper.eq("status", StatusEnum.Enable.getKey());
         return this.getOne(queryWrapper);
     }
 

icss-service/src/main/java/com/diagbot/facade/InquiryInfoFacade.java

@@ -1,5 +1,18 @@
 package com.diagbot.facade;
 
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+import com.diagbot.enums.IsDeleteEnum;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.dto.GetInquiryDetailDTO;
 import com.diagbot.dto.HisInquiryDTO;
@@ -15,24 +28,12 @@ import com.diagbot.enums.SexTypeEnum;
 import com.diagbot.service.impl.InquiryInfoServiceImpl;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
-import com.diagbot.util.StringUtil;
 import com.diagbot.vo.GetInquiryDetailVO;
 import com.diagbot.vo.GetLastOtherVO;
 import com.diagbot.vo.HisInquirysVO;
 import com.diagbot.vo.ReadInquiryVO;
 import com.diagbot.vo.SaveInquiryDetailVO;
 import com.diagbot.vo.SaveInquiryVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.stream.Collectors;
 
 /**
  * @author rengb
@@ -66,7 +67,7 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
         Date now = new Date();
 
         QueryWrapper<InquiryInfo> queryWrapper = new QueryWrapper<InquiryInfo>();
-        queryWrapper.eq("is_deleted", "N");
+        queryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey());
         queryWrapper.eq("hospital_id", saveInquiryVO.getHospitalId());
         queryWrapper.eq("hospital_dept_id", saveInquiryVO.getHospitalDeptId());
         queryWrapper.eq("doctor_id", saveInquiryVO.getDoctorId());
@@ -101,9 +102,6 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
 
         List<InquiryDetail> inquiryDetailList = new ArrayList<>();
         for (SaveInquiryDetailVO i : saveInquiryVO.getDetailList()) {
-            if (StringUtil.isBlank(i.getContent())) {
-                continue;
-            }
             InquiryDetail inquiryDetail = new InquiryDetail();
             inquiryDetail.setInquiryId(inquiryId);
             inquiryDetail.setType(i.getType());
@@ -128,7 +126,7 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
     public ReadInquiryDTO readInquiry(ReadInquiryVO readInquiryVO) {
         ReadInquiryDTO readInquiryDTO = new ReadInquiryDTO();
         QueryWrapper<InquiryInfo> queryWrapper = new QueryWrapper<InquiryInfo>();
-        queryWrapper.eq("is_deleted", "N");
+        queryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey());
         queryWrapper.eq("hospital_id", readInquiryVO.getHospitalId());
         queryWrapper.eq("hospital_dept_id", readInquiryVO.getHospitalDeptId());
         queryWrapper.eq("doctor_id", readInquiryVO.getDoctorId());
@@ -146,7 +144,7 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
     /**
      * 获取最近一次其他史信息
      *
-     * @param readInquiryVO
+     * @param getLastOtherVO
      * @return
      */
     public String getLastOther(GetLastOtherVO getLastOtherVO) {
@@ -173,7 +171,7 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
      */
     public List<HisInquiryDTO> hisInquirys(HisInquirysVO hisInquirysVO) {
         QueryWrapper<InquiryInfo> queryWrapper = new QueryWrapper<InquiryInfo>();
-        queryWrapper.eq("is_deleted", "N");
+        queryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey());
         queryWrapper.eq("hospital_id", hisInquirysVO.getHospitalId());
         queryWrapper.eq("hospital_dept_id", hisInquirysVO.getHospitalDeptId());
         queryWrapper.eq("doctor_id", hisInquirysVO.getDoctorId());

icss-service/src/main/java/com/diagbot/facade/PatientInfoFacade.java

@@ -5,6 +5,7 @@ import com.diagbot.dto.GetTopPatientInfoDTO;
 import com.diagbot.dto.PatientInfoDTO;
 import com.diagbot.entity.DoctorPageMode;
 import com.diagbot.entity.PatientInfo;
+import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.service.impl.PatientInfoServiceImpl;
 import com.diagbot.util.DateUtil;
 import com.diagbot.vo.GetTopPatientInfoVO;
@@ -48,7 +49,7 @@ public class PatientInfoFacade extends PatientInfoServiceImpl {
         getTopPatientInfoDTO.setRecordId(getTopPatientInfoVO.getRecordId());
         
         QueryWrapper<DoctorPageMode> doctorPageModeQe = new QueryWrapper<>();
-        doctorPageModeQe.eq("is_deleted", "N");
+        doctorPageModeQe.eq("is_deleted", IsDeleteEnum.N.getKey());
         doctorPageModeQe.eq("doctor_id", getTopPatientInfoDTO.getDoctorId());
         DoctorPageMode doctorPageMode = doctorPageModeFacade.getOne(doctorPageModeQe);
         if(doctorPageMode!=null){
@@ -67,7 +68,7 @@ public class PatientInfoFacade extends PatientInfoServiceImpl {
      */
     public PatientInfo getPatientByCode(String hospitalCode, String patientCode) {
         QueryWrapper<PatientInfo> queryWrapper = new QueryWrapper<PatientInfo>();
-        queryWrapper.eq("is_deleted", "N");
+        queryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey());
         queryWrapper.eq("hospital_code", hospitalCode);
         queryWrapper.eq("code", patientCode);
         return this.getOne(queryWrapper);

icss-service/src/main/java/com/diagbot/facade/TemplateInfoFacade.java

@@ -115,7 +115,7 @@ public class TemplateInfoFacade extends TemplateInfoServiceImpl {
     /**
      * 保存模板
      *
-     * @param templateInfoRevampVO
+     * @param templateInfosVO
      * @return
      */
     public boolean saveTemplateInfo(TemplateInfosVO templateInfosVO) {

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

@@ -13,7 +13,6 @@ import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.DeptInfoServiceImpl;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
-import com.diagbot.util.ListUtil;
 import com.diagbot.util.UserUtils;
 import com.diagbot.vo.AddDeptInfoVO;
 import com.diagbot.vo.GetDeptInfoDetialsVO;
@@ -49,8 +48,7 @@ public class DeptInfoFacade extends DeptInfoServiceImpl {
         QueryWrapper<DeptInfo> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey());
         queryWrapper.eq("name", addDeptInfoVO.getName());
-        List<DeptInfo> deptInfoList = this.list(queryWrapper);
-        if (ListUtil.isNotEmpty(deptInfoList)) {
+        if (this.count(queryWrapper) > 0) {
             throw new CommonException(CommonErrorCode.IS_EXISTS, "添加失败，科室已存在");
         }
         //添加科室
@@ -73,6 +71,15 @@ public class DeptInfoFacade extends DeptInfoServiceImpl {
      * @return
      */
     public Boolean updateDeptInfo(UpdateDeptInfoVO updateDeptInfoVO) {
+        //判断科室是否已被删除
+        QueryWrapper<DeptInfo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("is_deleted",IsDeleteEnum.Y.getKey());
+        queryWrapper.eq("id",updateDeptInfoVO.getId());
+        if(this.count(queryWrapper) > 0){
+            throw new CommonException(CommonErrorCode.RPC_ERROR,
+                    "科室已删除");
+        }
+        //修改操作
         DeptInfo deptInfo = this.getById(updateDeptInfoVO.getId());
         BeanUtil.copyProperties(updateDeptInfoVO, deptInfo);
         deptInfo.setModifier(UserUtils.getCurrentPrincipleID());
@@ -88,6 +95,15 @@ public class DeptInfoFacade extends DeptInfoServiceImpl {
      * @return
      */
     public Boolean deleteDeptInfo(UpdateDeptInfoVO updateDeptInfoVO) {
+        //判断科室是否已被删除
+        QueryWrapper<DeptInfo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("is_deleted",IsDeleteEnum.Y.getKey());
+        queryWrapper.eq("id",updateDeptInfoVO.getId());
+        if(this.count(queryWrapper) > 0){
+            throw new CommonException(CommonErrorCode.RPC_ERROR,
+                    "科室已删除");
+        }
+        //删除操作
         DeptInfo deptInfo = new DeptInfo();
         BeanUtil.copyProperties(updateDeptInfoVO, deptInfo);
         deptInfo.setModifier(UserUtils.getCurrentPrincipleID());

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

@@ -116,8 +116,8 @@ public class DisclaimerInformationFacaed extends DisclaimerInformationServiceImp
         QueryWrapper<DisclaimerInformation> disclaimerInformationFand = new QueryWrapper<>();
         disclaimerInformationFand.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("id",
                 disclaimerInformationAllVO.getId());
-        DisclaimerInformation data = getOne(disclaimerInformationFand);
-        if (data == null) {
+        int sum = count(disclaimerInformationFand);
+        if (sum == 0 ) {
             throw new CommonException(CommonErrorCode.NOT_EXISTS, "该数据不存在");
         }
         // 2.修改版本详情信息
@@ -150,6 +150,14 @@ public class DisclaimerInformationFacaed extends DisclaimerInformationServiceImp
      * @return
      */
     public Boolean cancelDisclaimerInformation(DisclaimerInformationIdVO disclaimerInformationIdVO) {
+    	 // 1.先判断数据是否存在有效
+        QueryWrapper<DisclaimerInformation> disclaimerInformationFand = new QueryWrapper<>();
+        disclaimerInformationFand.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("id",
+        		disclaimerInformationIdVO.getId());
+        int sum = count(disclaimerInformationFand);
+        if (sum == 0 ) {
+            throw new CommonException(CommonErrorCode.NOT_EXISTS, "该数据不存在");
+        }
         UpdateWrapper<DisclaimerInformation> disclaimerInformationNew = new UpdateWrapper<>();
         disclaimerInformationNew.in("id", disclaimerInformationIdVO.getId()).eq("is_deleted", IsDeleteEnum.N.getKey())
                 .set("is_deleted", IsDeleteEnum.Y.getKey()).set("modifier", UserUtils.getCurrentPrincipleID())
@@ -163,6 +171,14 @@ public class DisclaimerInformationFacaed extends DisclaimerInformationServiceImp
      * @return
      */
     public boolean startDisclaimerInformations(DisclaimerInformationIdVO disclaimerInformationIdVO) {
+    	 // 1.先判断数据是否存在有效
+        QueryWrapper<DisclaimerInformation> disclaimerInformationFand = new QueryWrapper<>();
+        disclaimerInformationFand.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("id",
+        		disclaimerInformationIdVO.getId());
+        int sum = count(disclaimerInformationFand);
+        if (sum == 0 ) {
+            throw new CommonException(CommonErrorCode.NOT_EXISTS, "该数据不存在");
+        }
         UpdateWrapper<DisclaimerInformation> disclaimerInformationNew = new UpdateWrapper<>();
         disclaimerInformationNew.in("id", disclaimerInformationIdVO.getId()).eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("status", StatusEnum.Disable.getKey()).set("modifier", UserUtils.getCurrentPrincipleID())
@@ -176,6 +192,14 @@ public class DisclaimerInformationFacaed extends DisclaimerInformationServiceImp
      * @return
      */
     public boolean endDisclaimerInformations(DisclaimerInformationIdVO disclaimerInformationIdVO) {
+    	 // 1.先判断数据是否存在有效
+        QueryWrapper<DisclaimerInformation> disclaimerInformationFand = new QueryWrapper<>();
+        disclaimerInformationFand.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("id",
+        		disclaimerInformationIdVO.getId());
+        int sum = count(disclaimerInformationFand);
+        if (sum == 0 ) {
+            throw new CommonException(CommonErrorCode.NOT_EXISTS, "该数据不存在");
+        }
         UpdateWrapper<DisclaimerInformation> disclaimerInformationNew = new UpdateWrapper<>();
         disclaimerInformationNew.in("id", disclaimerInformationIdVO.getId()).eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("status", StatusEnum.Enable.getKey()).set("modifier", UserUtils.getCurrentPrincipleID())

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.client.UserServiceClient;
 import com.diagbot.dto.GetDeptInfoDTO;
 import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.DeptInfo;
 import com.diagbot.entity.QuestionUsual;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.enums.UsualEnum;
@@ -51,6 +52,14 @@ public class QuestionUsualFacade extends QuestionUsualServiceImpl {
      * @return
      */
     public Boolean addQuestionUsual(QuestionUsualVO questionUsualVO) {
+        //判断科室是否已被删除
+        QueryWrapper<DeptInfo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("is_deleted",IsDeleteEnum.Y.getKey());
+        queryWrapper.eq("id",questionUsualVO.getDeptId());
+        if(deptInfoFacade.count(queryWrapper) > 0){
+            throw new CommonException(CommonErrorCode.RPC_ERROR,
+                    "科室已删除");
+        }
         List<QuestionUsual> addList = Lists.newArrayList();
         //判断该科室是否添加过常用标签
         QuestionUsual questionUsual = new QuestionUsual();
@@ -93,6 +102,14 @@ public class QuestionUsualFacade extends QuestionUsualServiceImpl {
      * @return
      */
     public Boolean deleteQuestionUsualByDeptId(DeleteQuestionUsualVO deleteQuestionUsualVO) {
+        //判断科室是否已被删除
+        QueryWrapper<DeptInfo> deptInfoQueryWrapper = new QueryWrapper<>();
+        deptInfoQueryWrapper.eq("is_deleted",IsDeleteEnum.Y.getKey());
+        deptInfoQueryWrapper.eq("id",deleteQuestionUsualVO.getDeptId());
+        if(deptInfoFacade.count(deptInfoQueryWrapper) > 0){
+            throw new CommonException(CommonErrorCode.RPC_ERROR,
+                    "科室已删除");
+        }
         //查询常用标签是否已被删除
         QueryWrapper<QuestionUsual> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("dept_id",deleteQuestionUsualVO.getDeptId());

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

@@ -1,6 +1,3 @@
-/**
- *
- */
 package com.diagbot.facade;
 
 import java.util.ArrayList;
@@ -9,6 +6,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import com.diagbot.enums.IsDeleteEnum;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -69,7 +67,7 @@ public class RetrievalFacade extends RetrievalServiceImpl {
 		RetrievalMapping retrievalMapping = new RetrievalMapping();
 		retrievalMapping.setGmtModified(DateUtil.now());
 		retrievalMapping.setModifier(userId);
-		retrievalMapping.setIsDeleted("Y");
+		retrievalMapping.setIsDeleted(IsDeleteEnum.Y.getKey());
 		
 		retrievalMappingFacade.update(retrievalMapping, mappingQe);
 		return true;
@@ -90,7 +88,7 @@ public class RetrievalFacade extends RetrievalServiceImpl {
     	
         QueryWrapper<Retrieval> retrievalQe = new QueryWrapper<Retrieval>();
         retrievalQe.in("name", retrievalNames);
-        retrievalQe.eq("is_deleted", "N");
+        retrievalQe.eq("is_deleted", IsDeleteEnum.N.getKey());
         Map<String,Retrieval> retrievalMap = this.list(retrievalQe).stream().collect(Collectors.toMap(Retrieval::getName,i->i));
         
         List<Retrieval> saveOrUpdateRetrievals = new ArrayList<>();
@@ -126,7 +124,7 @@ public class RetrievalFacade extends RetrievalServiceImpl {
         
         List<RetrievalMapping> addOrUpdateRetrievalMappings = new ArrayList<>();
         retrievalMappings.stream().filter(i->retrievalIds.contains(i.getRetrievalId())).forEach(i->{
-        	i.setIsDeleted("Y");
+        	i.setIsDeleted(IsDeleteEnum.Y.getKey());
         	i.setGmtModified(now);
         	i.setModifier(userId);
         	addOrUpdateRetrievalMappings.add(i);
@@ -150,7 +148,7 @@ public class RetrievalFacade extends RetrievalServiceImpl {
         			retrievalMapping.setShowType(detailMap.get(i.getName()).getRetrievalType());
         			retrievalMapping.setGmtModified(now);
         			retrievalMapping.setModifier(userId);
-        			retrievalMapping.setIsDeleted("N");
+        			retrievalMapping.setIsDeleted(IsDeleteEnum.N.getKey());
         			addOrUpdateRetrievalMappings.add(retrievalMapping);
         		}
         	}
@@ -170,7 +168,7 @@ public class RetrievalFacade extends RetrievalServiceImpl {
         IPage<RetrievalListDTO> ipage = this.getRetrievalList(retrievalListVO);
         List<String> ids = ipage.getRecords().stream().map(i->i.getOperatorName()).collect(Collectors.toList());
         RespDTO<Map<String, String>> respDTO = userServiceClient.getUserInfoByIds(ids);
-        if (respDTO == null || !"0".equals(respDTO.code)) {
+        if (respDTO == null || !CommonErrorCode.OK.getCode().equals(respDTO.code)) {
             throw new CommonException(CommonErrorCode.RPC_ERROR,
                     "获取用户信息失败");
         }

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())