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

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

@@ -65,8 +65,11 @@ public class RetrievalFacade extends RetrievalServiceImpl {
      * @return
      */
     public List<GetRetrievalsByTagDTO> getRetrievalsByTag(GetRetrievalsByTagVO getRetrievalsByTagVO) {
-
-        return this.baseMapper.getRetrievalsByTag(getRetrievalsByTagVO);
+    	List<GetRetrievalsByTagDTO> retList = baseMapper.getRetrievalsByTag(getRetrievalsByTagVO);
+    	if(retList.size()==0){
+    		throw new CommonException(CommonErrorCode.NOT_EXISTS);
+    	}
+        return retList;
     }
 
     /**
@@ -78,7 +81,9 @@ public class RetrievalFacade extends RetrievalServiceImpl {
     public Boolean delRetrievalsByQuesId(DelRetrievalsByQuesIdVO delRetrievalsByQuesIdVO) {
     	QueryWrapper<RetrievalMapping> mappingQe = new QueryWrapper<>();
     	mappingQe.eq("question_id", delRetrievalsByQuesIdVO.getQuestionId());
-    	
+    	if(retrievalMappingFacade.count(mappingQe)==0){
+    		throw new CommonException(CommonErrorCode.NOT_EXISTS);
+    	}
 		String userId = UserUtils.getCurrentPrincipleID();
 		RetrievalMapping retrievalMapping = new RetrievalMapping();
 		retrievalMapping.setGmtModified(DateUtil.now());

icssman-service/src/main/java/com/diagbot/vo/GetRetrievalsByTagVO.java

@@ -1,6 +1,6 @@
 package com.diagbot.vo;
 
-import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -21,13 +21,13 @@ public class GetRetrievalsByTagVO {
      * 标签id
      */
 	@ApiModelProperty(value="标签id")
+	@NotNull(message="标签id必传")
     private Long questionId;
 	
 	/**
 	 * 标签名称
 	 */
 	@ApiModelProperty(value="标签名称",required=true)
-	@NotBlank(message="标签名称必传")
 	private String questionName;