|
@@ -198,13 +198,6 @@ public class OrgService {
|
|
Org org = orgRepo.findOne(id);
|
|
Org org = orgRepo.findOne(id);
|
|
org.setEnable(enable);
|
|
org.setEnable(enable);
|
|
orgRepo.save(org);
|
|
orgRepo.save(org);
|
|
- if (enable == false) {
|
|
|
|
- List<UserEntity> users = userRepo.findByOrgId(id);
|
|
|
|
- for (UserEntity user : users) {
|
|
|
|
- user.setEnable(false);
|
|
|
|
- userRepo.save(user);
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
return org;
|
|
return org;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -213,7 +206,6 @@ public class OrgService {
|
|
Specification<Org> specification = getSpecification(orgCriteria);
|
|
Specification<Org> specification = getSpecification(orgCriteria);
|
|
return orgRepo.findAll(specification, pageable);
|
|
return orgRepo.findAll(specification, pageable);
|
|
}
|
|
}
|
|
- // orgCriteria.setType(OrgType.SCHOOL);
|
|
|
|
ExampleMatcher exampleMatcher = ExampleMatcher.matching().withMatcher("name", contains())
|
|
ExampleMatcher exampleMatcher = ExampleMatcher.matching().withMatcher("name", contains())
|
|
.withMatcher("code", contains());
|
|
.withMatcher("code", contains());
|
|
Example<Org> examExamStudentple = Example.of(orgCriteria, exampleMatcher);
|
|
Example<Org> examExamStudentple = Example.of(orgCriteria, exampleMatcher);
|