|  | @@ -450,10 +450,10 @@ public class JiaoYangReportController extends BaseController {
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |          Map<String, Object> requestMap = new HashMap<>();
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -       /* String roleId = sysRoleService.getRoleBYUserId(userId);
 | 
	
		
			
				|  |  | -        if ("jy_bd".equals(roleId) || "jy_bd_manage".equals(roleId) || "jy_scissors_manage".equals(roleId) || "jy_scissors".equals(roleId)) {
 | 
	
		
			
				|  |  | +        String roleId = sysRoleService.getRoleBYUserId(userId);
 | 
	
		
			
				|  |  | +        if ("jy_out_operation".equals(roleId) || "jy_out_operation_manager".equals(roleId)) {
 | 
	
		
			
				|  |  |              List<Long> userIds = new ArrayList<>();
 | 
	
		
			
				|  |  | -            if ("jy_bd_manage".equals(roleId) || "jy_scissors_manage".equals(roleId)) {
 | 
	
		
			
				|  |  | +            if ("jy_out_operation_manager".equals(roleId)) {
 | 
	
		
			
				|  |  |                  Long deptId = sysDeptService.getDeptIdByUserId(userId);
 | 
	
		
			
				|  |  |                  userIds = sysDeptService.getDeptUserListByDeptId(deptId);
 | 
	
		
			
				|  |  |              } else {
 | 
	
	
		
			
				|  | @@ -464,20 +464,7 @@ public class JiaoYangReportController extends BaseController {
 | 
	
		
			
				|  |  |                  return getDataTable(new ArrayList<JSONObject>());
 | 
	
		
			
				|  |  |              }
 | 
	
		
			
				|  |  |              requestMap.put("promoterIds", promoterIds);
 | 
	
		
			
				|  |  | -        }*/
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  | -        String roleId = sysRoleService.getRoleBYUserId(userId);
 | 
	
		
			
				|  |  | -        if ("jy_out_operation".equals(roleId)) {
 | 
	
		
			
				|  |  | -            List<Long> userIds = new ArrayList<>();
 | 
	
		
			
				|  |  | -            userIds.add(userId);
 | 
	
		
			
				|  |  | -            List<Long> promoterIds = jiaoYangReportService.getPromoterIdsByUserIds(userIds);
 | 
	
		
			
				|  |  | -            if (Check.isNull(promoterIds)) {
 | 
	
		
			
				|  |  | -                return getDataTable(new ArrayList<JSONObject>());
 | 
	
		
			
				|  |  | -            }
 | 
	
		
			
				|  |  | -            requestMap.put("promoterIds", promoterIds);
 | 
	
		
			
				|  |  |          }
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  |          if (!Check.isNull(orderStartDate)) {
 | 
	
		
			
				|  |  |              Long start = DateUtils.strDateToInt(orderStartDate);
 | 
	
		
			
				|  |  |              requestMap.put("start", start);
 | 
	
	
		
			
				|  | @@ -515,11 +502,10 @@ public class JiaoYangReportController extends BaseController {
 | 
	
		
			
				|  |  |                                 @ApiParam("类型") @RequestParam(value = "type", required = false) Long type,
 | 
	
		
			
				|  |  |                                 Long userId) throws IOException {
 | 
	
		
			
				|  |  |          Map<String, Object> requestMap = new HashMap<>();
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  | -       /* String roleId = sysRoleService.getRoleBYUserId(userId);
 | 
	
		
			
				|  |  | -        if ("jy_bd".equals(roleId) || "jy_bd_manage".equals(roleId) || "jy_scissors_manage".equals(roleId) || "jy_scissors".equals(roleId)) {
 | 
	
		
			
				|  |  | +        String roleId = sysRoleService.getRoleBYUserId(userId);
 | 
	
		
			
				|  |  | +        if ("jy_out_operation".equals(roleId) || "jy_out_operation_manager".equals(roleId)) {
 | 
	
		
			
				|  |  |              List<Long> userIds = new ArrayList<>();
 | 
	
		
			
				|  |  | -            if ("jy_bd_manage".equals(roleId) || "jy_scissors_manage".equals(roleId)) {
 | 
	
		
			
				|  |  | +            if ("jy_out_operation_manager".equals(roleId)) {
 | 
	
		
			
				|  |  |                  Long deptId = sysDeptService.getDeptIdByUserId(userId);
 | 
	
		
			
				|  |  |                  userIds = sysDeptService.getDeptUserListByDeptId(deptId);
 | 
	
		
			
				|  |  |              } else {
 | 
	
	
		
			
				|  | @@ -527,17 +513,6 @@ public class JiaoYangReportController extends BaseController {
 | 
	
		
			
				|  |  |              }
 | 
	
		
			
				|  |  |              List<Long> promoterIds = jiaoYangReportService.getPromoterIdsByUserIds(userIds);
 | 
	
		
			
				|  |  |              if (Check.isNull(promoterIds)) {
 | 
	
		
			
				|  |  | -                return getDataTable(new ArrayList<JSONObject>());
 | 
	
		
			
				|  |  | -            }
 | 
	
		
			
				|  |  | -            requestMap.put("promoterIds", promoterIds);
 | 
	
		
			
				|  |  | -        }*/
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  | -        String roleId = sysRoleService.getRoleBYUserId(userId);
 | 
	
		
			
				|  |  | -        if ("jy_out_operation".equals(roleId)) {
 | 
	
		
			
				|  |  | -            List<Long> userIds = new ArrayList<>();
 | 
	
		
			
				|  |  | -            userIds.add(userId);
 | 
	
		
			
				|  |  | -            List<Long> promoterIds = jiaoYangReportService.getPromoterIdsByUserIds(userIds);
 | 
	
		
			
				|  |  | -            if (Check.isNull(promoterIds)) {
 | 
	
		
			
				|  |  |                  return;
 | 
	
		
			
				|  |  |              }
 | 
	
		
			
				|  |  |              requestMap.put("promoterIds", promoterIds);
 | 
	
	
		
			
				|  | @@ -631,9 +606,9 @@ public class JiaoYangReportController extends BaseController {
 | 
	
		
			
				|  |  |              @ApiParam("商品ID") @RequestParam(value = "itemId", required = false) String itemId, Long userId) {
 | 
	
		
			
				|  |  |          Map<String, Object> requestMap = new HashMap<>();
 | 
	
		
			
				|  |  |          String roleId = sysRoleService.getRoleBYUserId(userId);
 | 
	
		
			
				|  |  | -        if ("jy_bd".equals(roleId) || "jy_bd_manage".equals(roleId) || "jy_scissors_manage".equals(roleId) || "jy_scissors".equals(roleId)) {
 | 
	
		
			
				|  |  | +        if ("jy_bd".equals(roleId) || "jy_bd_manage".equals(roleId) || "jy_scissors_manage".equals(roleId) || "jy_scissors".equals(roleId) || "jy_out_operation_manager".equals(roleId) ||  "jy_out_operation".equals(roleId)) {
 | 
	
		
			
				|  |  |              List<Long> userIds = new ArrayList<>();
 | 
	
		
			
				|  |  | -            if ("jy_bd_manage".equals(roleId) || "jy_scissors_manage".equals(roleId)) {
 | 
	
		
			
				|  |  | +            if ("jy_bd_manage".equals(roleId) || "jy_scissors_manage".equals(roleId) || "jy_out_operation_manager".equals(roleId)) {
 | 
	
		
			
				|  |  |                  Long deptId = sysDeptService.getDeptIdByUserId(userId);
 | 
	
		
			
				|  |  |                  userIds = sysDeptService.getDeptUserListByDeptId(deptId);
 | 
	
		
			
				|  |  |              } else {
 | 
	
	
		
			
				|  | @@ -683,9 +658,9 @@ public class JiaoYangReportController extends BaseController {
 | 
	
		
			
				|  |  |              @ApiParam("订单结束时间") @RequestParam(value = "orderEndDate", required = false) String orderEndDate, Long userId) {
 | 
	
		
			
				|  |  |          Map<String, Object> requestMap = new HashMap<>();
 | 
	
		
			
				|  |  |          String roleId = sysRoleService.getRoleBYUserId(userId);
 | 
	
		
			
				|  |  | -        if ("jy_bd".equals(roleId) || "jy_bd_manage".equals(roleId) || "jy_scissors_manage".equals(roleId) || "jy_scissors".equals(roleId)) {
 | 
	
		
			
				|  |  | +        if ("jy_bd".equals(roleId) || "jy_bd_manage".equals(roleId) || "jy_scissors_manage".equals(roleId) || "jy_scissors".equals(roleId)  || "jy_out_operation".equals(roleId) || "jy_out_operation_manager".equals(roleId)) {
 | 
	
		
			
				|  |  |              List<Long> userIds = new ArrayList<>();
 | 
	
		
			
				|  |  | -            if ("jy_bd_manage".equals(roleId) || "jy_scissors_manage".equals(roleId)) {
 | 
	
		
			
				|  |  | +            if ("jy_bd_manage".equals(roleId) || "jy_scissors_manage".equals(roleId) || "jy_out_operation_manager".equals(roleId)) {
 | 
	
		
			
				|  |  |                  Long deptId = sysDeptService.getDeptIdByUserId(userId);
 | 
	
		
			
				|  |  |                  userIds = sysDeptService.getDeptUserListByDeptId(deptId);
 | 
	
		
			
				|  |  |              } else {
 | 
	
	
		
			
				|  | @@ -799,9 +774,9 @@ public class JiaoYangReportController extends BaseController {
 | 
	
		
			
				|  |  |          JSONObject returnJson = new JSONObject();
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |          String roleId = sysRoleService.getRoleBYUserId(userId);
 | 
	
		
			
				|  |  | -        if ("jy_bd".equals(roleId) || "jy_bd_manage".equals(roleId) || "jy_scissors_manage".equals(roleId) || "jy_scissors".equals(roleId) || "jy_out_operation".equals(roleId)) {
 | 
	
		
			
				|  |  | +        if ("jy_bd".equals(roleId) || "jy_bd_manage".equals(roleId) || "jy_scissors_manage".equals(roleId) || "jy_scissors".equals(roleId) || "jy_out_operation".equals(roleId) || "jy_out_operation".equals(roleId)) {
 | 
	
		
			
				|  |  |              List<Long> userIds = new ArrayList<>();
 | 
	
		
			
				|  |  | -            if ("jy_bd_manage".equals(roleId) || "jy_scissors_manage".equals(roleId)) {
 | 
	
		
			
				|  |  | +            if ("jy_bd_manage".equals(roleId) || "jy_scissors_manage".equals(roleId) || "jy_out_operation_manager".equals(roleId)) {
 | 
	
		
			
				|  |  |                  Long deptId = sysDeptService.getDeptIdByUserId(userId);
 | 
	
		
			
				|  |  |                  userIds = sysDeptService.getDeptUserListByDeptId(deptId);
 | 
	
		
			
				|  |  |              } else {
 | 
	
	
		
			
				|  | @@ -878,9 +853,9 @@ public class JiaoYangReportController extends BaseController {
 | 
	
		
			
				|  |  |          JSONObject returnJson = new JSONObject();
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |          String roleId = sysRoleService.getRoleBYUserId(userId);
 | 
	
		
			
				|  |  | -        if ("jy_bd".equals(roleId) || "jy_bd_manage".equals(roleId) || "jy_scissors_manage".equals(roleId) || "jy_scissors".equals(roleId) || "jy_out_operation".equals(roleId)) {
 | 
	
		
			
				|  |  | +        if ("jy_bd".equals(roleId) || "jy_bd_manage".equals(roleId) || "jy_scissors_manage".equals(roleId) || "jy_scissors".equals(roleId) || "jy_out_operation".equals(roleId) || "jy_out_operation_manager".equals(roleId)) {
 | 
	
		
			
				|  |  |              List<Long> userIds = new ArrayList<>();
 | 
	
		
			
				|  |  | -            if ("jy_bd_manage".equals(roleId) || "jy_scissors_manage".equals(roleId)) {
 | 
	
		
			
				|  |  | +            if ("jy_bd_manage".equals(roleId) || "jy_scissors_manage".equals(roleId) || "jy_out_operation_manager".equals(roleId)) {
 | 
	
		
			
				|  |  |                  Long deptId = sysDeptService.getDeptIdByUserId(userId);
 | 
	
		
			
				|  |  |                  userIds = sysDeptService.getDeptUserListByDeptId(deptId);
 | 
	
		
			
				|  |  |              } else {
 | 
	
	
		
			
				|  | @@ -927,9 +902,9 @@ public class JiaoYangReportController extends BaseController {
 | 
	
		
			
				|  |  |          JSONObject returnJson = new JSONObject();
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |          String roleId = sysRoleService.getRoleBYUserId(userId);
 | 
	
		
			
				|  |  | -        if ("jy_bd".equals(roleId) || "jy_bd_manage".equals(roleId) || "jy_scissors_manage".equals(roleId) || "jy_scissors".equals(roleId) || "jy_out_operation".equals(roleId)) {
 | 
	
		
			
				|  |  | +        if ("jy_bd".equals(roleId) || "jy_bd_manage".equals(roleId) || "jy_scissors_manage".equals(roleId) || "jy_scissors".equals(roleId) || "jy_out_operation".equals(roleId) || "jy_out_operation_manager".equals(roleId)) {
 | 
	
		
			
				|  |  |              List<Long> userIds = new ArrayList<>();
 | 
	
		
			
				|  |  | -            if ("jy_bd_manage".equals(roleId) || "jy_scissors_manage".equals(roleId)) {
 | 
	
		
			
				|  |  | +            if ("jy_bd_manage".equals(roleId) || "jy_scissors_manage".equals(roleId) || "jy_out_operation_manager".equals(roleId)) {
 | 
	
		
			
				|  |  |                  Long deptId = sysDeptService.getDeptIdByUserId(userId);
 | 
	
		
			
				|  |  |                  userIds = sysDeptService.getDeptUserListByDeptId(deptId);
 | 
	
		
			
				|  |  |              } else {
 | 
	
	
		
			
				|  | @@ -1092,9 +1067,9 @@ public class JiaoYangReportController extends BaseController {
 | 
	
		
			
				|  |  |              Long userId) {
 | 
	
		
			
				|  |  |          Map<String, Object> requestMap = new HashMap<>();
 | 
	
		
			
				|  |  |          String roleId = sysRoleService.getRoleBYUserId(userId);
 | 
	
		
			
				|  |  | -        if ("jy_bd".equals(roleId) || "jy_bd_manage".equals(roleId) || "jy_scissors_manage".equals(roleId) || "jy_scissors".equals(roleId) || "jy_out_operation".equals(roleId)) {
 | 
	
		
			
				|  |  | +        if ("jy_bd".equals(roleId) || "jy_bd_manage".equals(roleId) || "jy_scissors_manage".equals(roleId) || "jy_scissors".equals(roleId) || "jy_out_operation".equals(roleId) || "jy_out_operation_manager".equals(roleId)) {
 | 
	
		
			
				|  |  |              List<Long> userIds = new ArrayList<>();
 | 
	
		
			
				|  |  | -            if ("jy_bd_manage".equals(roleId) || "jy_scissors_manage".equals(roleId)) {
 | 
	
		
			
				|  |  | +            if ("jy_bd_manage".equals(roleId) || "jy_scissors_manage".equals(roleId) || "jy_out_operation_manager".equals(roleId)) {
 | 
	
		
			
				|  |  |                  Long deptId = sysDeptService.getDeptIdByUserId(userId);
 | 
	
		
			
				|  |  |                  userIds = sysDeptService.getDeptUserListByDeptId(deptId);
 | 
	
		
			
				|  |  |              } else {
 | 
	
	
		
			
				|  | @@ -1147,9 +1122,9 @@ public class JiaoYangReportController extends BaseController {
 | 
	
		
			
				|  |  |      ) {
 | 
	
		
			
				|  |  |          Map<String, Object> requestMap = new HashMap<>();
 | 
	
		
			
				|  |  |          String roleId = sysRoleService.getRoleBYUserId(userId);
 | 
	
		
			
				|  |  | -        if ("jy_bd".equals(roleId) || "jy_bd_manage".equals(roleId) || "jy_scissors_manage".equals(roleId) || "jy_scissors".equals(roleId) || "jy_out_operation".equals(roleId)) {
 | 
	
		
			
				|  |  | +        if ("jy_bd".equals(roleId) || "jy_bd_manage".equals(roleId) || "jy_scissors_manage".equals(roleId) || "jy_scissors".equals(roleId) || "jy_out_operation".equals(roleId) || "jy_out_operation_manager".equals(roleId)) {
 | 
	
		
			
				|  |  |              List<Long> userIds = new ArrayList<>();
 | 
	
		
			
				|  |  | -            if ("jy_bd_manage".equals(roleId) || "jy_scissors_manage".equals(roleId)) {
 | 
	
		
			
				|  |  | +            if ("jy_bd_manage".equals(roleId) || "jy_scissors_manage".equals(roleId) || "jy_out_operation_manager".equals(roleId)) {
 | 
	
		
			
				|  |  |                  Long deptId = sysDeptService.getDeptIdByUserId(userId);
 | 
	
		
			
				|  |  |                  userIds = sysDeptService.getDeptUserListByDeptId(deptId);
 | 
	
		
			
				|  |  |              } else {
 |