From 1ab8179c7c102cdb4921ec862221f1cefb7d69b4 Mon Sep 17 00:00:00 2001
From: wangfs <15029758498@163.com>
Date: Thu, 2 Aug 2018 15:31:35 +0800
Subject: [PATCH] 斯蒂芬斯蒂芬

---
 src/main/java/com/zteits/oa/report/web/OAuthController.java | 3 +--
 src/main/resources/mybatis/smapper/AsraDailySmapper.xml     | 8 +++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/zteits/oa/report/web/OAuthController.java b/src/main/java/com/zteits/oa/report/web/OAuthController.java
index 2526c7b..d0391e9 100644
--- a/src/main/java/com/zteits/oa/report/web/OAuthController.java
+++ b/src/main/java/com/zteits/oa/report/web/OAuthController.java
@@ -1,6 +1,5 @@
 package com.zteits.oa.report.web;
 
-import static org.mockito.Matchers.contains;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -148,7 +147,7 @@ public class OAuthController {
     	rootAllList.add(opId);
     	//1.查找第一级下的所有用户
     	List<Long> rootOpIds = this.getRootOpIds(opId);
-    	
+    	rootAllList.addAll(rootOpIds);
     	//2.查找第二级以下所有用户
     	if(CollectionUtil.isNotEmpty(rootOpIds)){
     		rootAllList.addAll(rootOpIds);
diff --git a/src/main/resources/mybatis/smapper/AsraDailySmapper.xml b/src/main/resources/mybatis/smapper/AsraDailySmapper.xml
index ddd272c..03c3728 100644
--- a/src/main/resources/mybatis/smapper/AsraDailySmapper.xml
+++ b/src/main/resources/mybatis/smapper/AsraDailySmapper.xml
@@ -44,16 +44,18 @@
 		FROM
 			asra_project c,
 			asra_daily a
-		LEFT JOIN asra_op_relations b ON a.asar_op_id = b.op_id
-		AND (b.parent_id = #{opId} OR b.op_id = #{opId})
 		WHERE
 			1 = 1
 		AND a.project_id = c.id
+		AND  a.asar_op_id  in 
+		<foreach collection="opIds" item="opId" open="(" close=")" separator=",">
+	         #{opId}
+	      </foreach>
 		AND a.data_state =1
 		<![CDATA[AND a.daily_date >= #{beginTime} ]]>
 		<![CDATA[AND a.daily_date <= #{endTime}]]>
 		<if test="projectId != null and projectId !=''">
-		  and a.project_id=#{projectId} 
+		    and a.project_id=#{projectId} 
 		</if>
 		<if test="opName != null and opName !=''">
 		  and a.asar_op_name like CONCAT('%',#{opName},'%')
--
libgit2 0.21.4