|
@@ -681,7 +681,7 @@ public class JiaoYangReportController extends BaseController {
|
|
|
JSONObject returnJson = new JSONObject();
|
|
JSONObject returnJson = new JSONObject();
|
|
|
|
|
|
|
|
String roleId = sysRoleService.getRoleBYUserId(userId);
|
|
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)) {
|
|
|
List<Long> userIds = new ArrayList<>();
|
|
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)) {
|
|
|
Long deptId = sysDeptService.getDeptIdByUserId(userId);
|
|
Long deptId = sysDeptService.getDeptIdByUserId(userId);
|
|
@@ -760,7 +760,7 @@ public class JiaoYangReportController extends BaseController {
|
|
|
JSONObject returnJson = new JSONObject();
|
|
JSONObject returnJson = new JSONObject();
|
|
|
|
|
|
|
|
String roleId = sysRoleService.getRoleBYUserId(userId);
|
|
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)) {
|
|
|
List<Long> userIds = new ArrayList<>();
|
|
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)) {
|
|
|
Long deptId = sysDeptService.getDeptIdByUserId(userId);
|
|
Long deptId = sysDeptService.getDeptIdByUserId(userId);
|
|
@@ -809,7 +809,7 @@ public class JiaoYangReportController extends BaseController {
|
|
|
JSONObject returnJson = new JSONObject();
|
|
JSONObject returnJson = new JSONObject();
|
|
|
|
|
|
|
|
String roleId = sysRoleService.getRoleBYUserId(userId);
|
|
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)) {
|
|
|
List<Long> userIds = new ArrayList<>();
|
|
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)) {
|
|
|
Long deptId = sysDeptService.getDeptIdByUserId(userId);
|
|
Long deptId = sysDeptService.getDeptIdByUserId(userId);
|
|
@@ -974,7 +974,7 @@ public class JiaoYangReportController extends BaseController {
|
|
|
Long userId) {
|
|
Long userId) {
|
|
|
Map<String, Object> requestMap = new HashMap<>();
|
|
Map<String, Object> requestMap = new HashMap<>();
|
|
|
String roleId = sysRoleService.getRoleBYUserId(userId);
|
|
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)) {
|
|
|
List<Long> userIds = new ArrayList<>();
|
|
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)) {
|
|
|
Long deptId = sysDeptService.getDeptIdByUserId(userId);
|
|
Long deptId = sysDeptService.getDeptIdByUserId(userId);
|
|
@@ -1029,7 +1029,7 @@ public class JiaoYangReportController extends BaseController {
|
|
|
) {
|
|
) {
|
|
|
Map<String, Object> requestMap = new HashMap<>();
|
|
Map<String, Object> requestMap = new HashMap<>();
|
|
|
String roleId = sysRoleService.getRoleBYUserId(userId);
|
|
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)) {
|
|
|
List<Long> userIds = new ArrayList<>();
|
|
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)) {
|
|
|
Long deptId = sysDeptService.getDeptIdByUserId(userId);
|
|
Long deptId = sysDeptService.getDeptIdByUserId(userId);
|