From 0cb7f9e2a8f127470cf853fb7d1d0cc1539fe284 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Tue, 15 Jun 2021 00:52:25 +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/XmMenuController.java   | 15 +++++++++++++++
 .../mapper/xm/core/dao/XmIterationMenuMapper.xml  |  2 +-
 .../mybatis/mapper/xm/core/dao/XmMenuMapper.xml   |  8 +++++---
 .../mapper/xm/core/dao/XmProjectMapper.xml        |  3 +++
 4 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmMenuController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmMenuController.java
index 875b1145..10e7dd97 100644
--- a/xm-core/src/main/java/com/xm/core/ctrl/XmMenuController.java
+++ b/xm-core/src/main/java/com/xm/core/ctrl/XmMenuController.java
@@ -68,6 +68,21 @@ public class XmMenuController {
 		Map<String,Object> m = new HashMap<>(); 
 		RequestUtils.transformArray(xmMenu, "menuIds");
 		PageUtils.startPage(xmMenu);
+		String menuId= (String) xmMenu.get("menuId");
+		Object menuIds=  xmMenu.get("menuIds");
+		String projectId= (String) xmMenu.get("projectId");
+		String mmUserid= (String) xmMenu.get("mmUserid");
+		String pmenuId= (String) xmMenu.get("pmenuId");
+		String productId= (String) xmMenu.get("productId");
+		String excludeIterationId= (String) xmMenu.get("excludeIterationId");
+
+		User user = LoginUtils.getCurrentUserInfo();
+
+		xmMenu.put("userid",user.getUserid());
+		if( !StringUtils.hasText(menuId) && !(StringUtils.hasText(projectId) || StringUtils.hasText(mmUserid)|| StringUtils.hasText(pmenuId)||menuIds!=null
+				|| StringUtils.hasText(productId) || StringUtils.hasText(excludeIterationId)  ) ){
+			xmMenu.put("compete",user.getUserid());
+		}
 		List<Map<String,Object>>	xmMenuList = xmMenuService.selectListMapByWhere(xmMenu);	//列出XmMenu列表
 		PageUtils.responePage(m, xmMenuList);
 		m.put("data",xmMenuList);
diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmIterationMenuMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmIterationMenuMapper.xml
index 49678a7b..dbdb4629 100644
--- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmIterationMenuMapper.xml
+++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmIterationMenuMapper.xml
@@ -23,7 +23,7 @@
 				    </foreach>  
 			 </if>
 			<include refid="where"/>
-			<if test="key != null and key !='' ">  m.menu_name like #{key}     </if>
+			<if test="key != null and key !='' "> and m.menu_name like #{key}     </if>
 		</where>
 	</select>
 	
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 2301dd13..a1836020 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,11 @@
 				    </foreach>  
 			 </if>
 			<include refid="where"/>
-			<if test="key != null and key !='' ">       </if> 
-			<if test=" excludeIterationId !=null and excludeIterationId !='' "> 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="key != null and key !='' ">  and res.menu_name like #{key}     </if>
+			<if test=" excludeIterationId !=null and excludeIterationId !='' and (includeIterationAll==null or includeIterationAll=='') "> 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=" includeIterationAll !=null and includeIterationAll !=''  and (excludeIterationId !=null and excludeIterationId !='' ) "> and  exists ( select 1 from XM.xm_iteration_menu im where  im.iteration_id !=#{excludeIterationId} and  im.menu_id=res.menu_id)</if>
+			<if test=" includeIterationAll !=null and includeIterationAll !=''  and (excludeIterationId ==null or excludeIterationId =='' ) "> and  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>
diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMapper.xml
index 22c9fee2..59e95145 100644
--- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMapper.xml
+++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMapper.xml
@@ -69,6 +69,9 @@
 				        #{item}  
 				    </foreach>  
 			 </if>
+
+			<if test=" createTimeStart !=null "> and res.create_time &gt; #{createTimeStart} </if>
+			<if test=" createTimeEnd !=null "> and res.create_time &lt; #{createTimeEnd} </if>
 			<include refid="where"/>
 
  			<!-- 筛选属于当前年份的项目 -->