斯蒂芬斯蒂芬

王富生
1 parent b1704d7c
Showing 2 changed files with 6 additions and 5 deletions
src/main/java/com/zteits/oa/report/web/OAuthController.java
src/main/resources/mybatis/smapper/AsraDailySmapper.xml
 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);
@@ -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},'%')