From cd1bb7f4bbfed22bf934073e99aad59a85a74344 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Wed, 16 Jun 2021 12:54:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=9F=A5=E8=AF=A2=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/xm/core/ctrl/XmQuestionController.java   |  2 +-
 .../mybatis/mapper/xm/core/dao/XmMenuMapper.xml       | 11 +++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmQuestionController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmQuestionController.java
index 5d35aeb2..11787498 100644
--- a/xm-core/src/main/java/com/xm/core/ctrl/XmQuestionController.java
+++ b/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;
diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuMapper.xml
index 4ef0a5bc..b99503c5 100644
--- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuMapper.xml
+++ b/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>