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

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

@@ -1,7 +1,6 @@
 package com.diagbot.facade;
 
-import java.util.List;
-
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -9,13 +8,16 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.dto.DiagnoseQuestionPageDTO;
 import com.diagbot.entity.DiagnoseQuestion;
 import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.service.DiagnoseQuestionService;
 import com.diagbot.service.impl.DiagnoseQuestionServiceImpl;
 import com.diagbot.vo.DiagnoseQuestionPageVO;
 
 @Component
-public class DiagnoseQuestionFacade  extends DiagnoseQuestionServiceImpl{
+public class DiagnoseQuestionFacade  {
 	
 
+	@Autowired
+	DiagnoseQuestionService diagnoseQuestionService;
 	/**
 	 * 
 	 * @param diagnoseQuestionPageVO
@@ -24,9 +26,13 @@ public class DiagnoseQuestionFacade  extends DiagnoseQuestionServiceImpl{
 	public IPage<DiagnoseQuestionPageDTO> queryQuestionPage(DiagnoseQuestionPageVO diagnoseQuestionPageVO) {
 		
 		QueryWrapper<DiagnoseQuestion> diaQuery = new QueryWrapper<>();
-		diaQuery.like("dis_name",diagnoseQuestionPageVO.getDisName()).like("question_name",diagnoseQuestionPageVO.getQuestionCode()).like("type",diagnoseQuestionPageVO.getType()).eq("is_deleted",IsDeleteEnum.N.getKey());
-		
-		IPage<DiagnoseQuestionPageDTO> datas = page(diagnoseQuestionPageVO, diaQuery);
+		if(diagnoseQuestionPageVO.getType() != null ||diagnoseQuestionPageVO.getType() != 0 ){
+			diaQuery.like("dis_name",diagnoseQuestionPageVO.getDisName()).like("question_name",diagnoseQuestionPageVO.getQuestionCode()).like("type",diagnoseQuestionPageVO.getType()).eq("is_deleted",IsDeleteEnum.N.getKey());
+		}else{
+			diaQuery.like("dis_name",diagnoseQuestionPageVO.getDisName()).like("question_name",diagnoseQuestionPageVO.getQuestionCode()).eq("is_deleted",IsDeleteEnum.N.getKey());
+		}
+				
+		IPage<DiagnoseQuestionPageDTO> datas = diagnoseQuestionService.page(diagnoseQuestionPageVO, diaQuery);
 		
 		return datas;
 	}