|  | @@ -14,6 +14,7 @@ import org.jeecg.modules.system.entity.SysUser;
 | 
	
		
			
				|  |  |  import org.springframework.beans.factory.annotation.Autowired;
 | 
	
		
			
				|  |  |  import org.springframework.stereotype.Service;
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | +import java.util.ArrayList;
 | 
	
		
			
				|  |  |  import java.util.HashMap;
 | 
	
		
			
				|  |  |  import java.util.List;
 | 
	
		
			
				|  |  |  import java.util.Map;
 | 
	
	
		
			
				|  | @@ -63,15 +64,13 @@ public class ProjectMemberServiceImpl extends ServiceImpl<ProjectMemberMapper, P
 | 
	
		
			
				|  |  |      }
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |      //视频报表
 | 
	
		
			
				|  |  | +    @Override
 | 
	
		
			
				|  |  |      public List<ProjectMember> getProjects(List<Integer> mediaIds){
 | 
	
		
			
				|  |  |          LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 | 
	
		
			
				|  |  |          String userId = sysUser.getId();
 | 
	
		
			
				|  |  |          String roleCode = memberMapper.getRoleCodeByUserId(userId);
 | 
	
		
			
				|  |  |          String companyId = memberMapper.getCompanyIdByUserId(userId);
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -        //List<Integer> mediaIds = new ArrayList<>();
 | 
	
		
			
				|  |  | -        //mediaIds.add(1);
 | 
	
		
			
				|  |  | -        //mediaIds.add(3);
 | 
	
		
			
				|  |  |          //角色权限判断
 | 
	
		
			
				|  |  |          List<ProjectMember> projectMemberList = null;
 | 
	
		
			
				|  |  |          if(roleCode.equals("plan") || roleCode.equals("clip") || roleCode.equals("shot") || roleCode.equals("plane")|| roleCode.equals("planeLeader")){
 | 
	
	
		
			
				|  | @@ -80,10 +79,12 @@ public class ProjectMemberServiceImpl extends ServiceImpl<ProjectMemberMapper, P
 | 
	
		
			
				|  |  |              projectMemberList = memberMapper.designLeaderProjects(companyId, mediaIds);
 | 
	
		
			
				|  |  |          }else if(roleCode.equals(CtopRoleCodeConstant.COMMON_ROLE_CODE_ADMIN)){
 | 
	
		
			
				|  |  |              projectMemberList = memberMapper.adminProjects(mediaIds);
 | 
	
		
			
				|  |  | -        }else if(roleCode.equals("operator") || roleCode.equals("operationAssistant") || roleCode.equals("touTiaoOperationManager")){
 | 
	
		
			
				|  |  | +        }else if(roleCode.equals("operator") || roleCode.equals("operationAssistant") || roleCode.equals("touTiaoOperationManager")||roleCode.equals("huananyunying")){
 | 
	
		
			
				|  |  |              projectMemberList = memberMapper.operationProjects(userId, mediaIds);
 | 
	
		
			
				|  |  |          }
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  | +        if(null == projectMemberList){
 | 
	
		
			
				|  |  | +            projectMemberList = new ArrayList<>();
 | 
	
		
			
				|  |  | +        }
 | 
	
		
			
				|  |  |          return projectMemberList;
 | 
	
		
			
				|  |  |      }
 | 
	
		
			
				|  |  |  
 |