|
@@ -54,7 +54,7 @@ public class StudentApi {
|
|
@PathVariable Integer pageSize){
|
|
@PathVariable Integer pageSize){
|
|
AccessUser accessUser = (AccessUser) request.getAttribute("accessUser");
|
|
AccessUser accessUser = (AccessUser) request.getAttribute("accessUser");
|
|
if(accessUser != null){
|
|
if(accessUser != null){
|
|
- if(accessUser.getRootOrgId() == accessUser.getOrgId()){
|
|
|
|
|
|
+ if(accessUser.getRootOrgId().longValue() == accessUser.getOrgId().longValue()){
|
|
studentCriteria.setRootOrgId(accessUser.getRootOrgId());
|
|
studentCriteria.setRootOrgId(accessUser.getRootOrgId());
|
|
}else{
|
|
}else{
|
|
studentCriteria.setOrgId(accessUser.getOrgId());
|
|
studentCriteria.setOrgId(accessUser.getOrgId());
|
|
@@ -69,7 +69,7 @@ public class StudentApi {
|
|
@ModelAttribute Student studentCriteria){
|
|
@ModelAttribute Student studentCriteria){
|
|
AccessUser accessUser = (AccessUser) request.getAttribute("accessUser");
|
|
AccessUser accessUser = (AccessUser) request.getAttribute("accessUser");
|
|
if(accessUser != null){
|
|
if(accessUser != null){
|
|
- if(accessUser.getRootOrgId() == accessUser.getOrgId()){
|
|
|
|
|
|
+ if(accessUser.getRootOrgId().longValue() == accessUser.getOrgId().longValue()){
|
|
studentCriteria.setRootOrgId(accessUser.getRootOrgId());
|
|
studentCriteria.setRootOrgId(accessUser.getRootOrgId());
|
|
}else{
|
|
}else{
|
|
studentCriteria.setOrgId(accessUser.getOrgId());
|
|
studentCriteria.setOrgId(accessUser.getOrgId());
|