优化查询条件

xm-core/src/main/java/com/xm/core/ctrl/XmQuestionController.java

@@ -124,7 +124,7 @@ public class XmQuestionController {
 		Map<String,Object> m = new HashMap<>();
 		Tips tips=new Tips("成功新增一条数据");
 		try{
-			if(StringUtils.hasText(xmQuestionVo.getProjectId())){
+			if(!StringUtils.hasText(xmQuestionVo.getProjectId())){
 				tips.setFailureMsg("项目编号projectId必传");
 				m.put("tips", tips);
 				return m;

xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuMapper.xml

@@ -78,9 +78,16 @@
 				    </foreach>  
 			 </if>
 			<include refid="where"/>
+
+			<if test=' excludeIterationId !=null and excludeIterationId !="" and iterationFilterType!=null and iterationFilterType!=""'>
+				and <if test='iterationFilterType=="not-join"'> not  </if>
+				  exists ( select 1 from XM.xm_iteration_menu im where im.iteration_id=#{excludeIterationId} and im.menu_id=res.menu_id)
+			</if>
+			<if test=' taskFilterType!=null and taskFilterType!="" '>
+				and <if test='taskFilterType=="not-join"'> not  </if>
+			    exists ( select 1 from XM.xm_task t where  t.menu_id=res.menu_id)
+			</if>
 			<if test="key != null and key !='' ">  and res.menu_name like #{key}     </if>
-			<if test=' excludeIterationId !=null and excludeIterationId !="" and excludeIterationAll!="1" '> and not exists ( select 1 from XM.xm_iteration_menu im where im.iteration_id=#{excludeIterationId} and im.menu_id=res.menu_id)</if>
-			<if test=' excludeIterationAll =="1" '> and not exists ( select 1 from XM.xm_iteration_menu im where  im.menu_id=res.menu_id)</if>
 		</where>
 		order by res.seq_no asc
 	</select>