Commit 537c0aa0 authored by zhangc's avatar zhangc

commit

parent edf302e7
......@@ -62,7 +62,7 @@ public class OrganizationManageImpl implements OrganizationManageService {
query.ne("status",OrgStatusEnum.CANCEL);
query.orderByDesc("create_date");
IPage<ApiOrg> orgIPage = apiOrgMapper.selectPage(page, query);
if (CollectionUtils.isEmpty(orgIPage.getRecords())){
if (!CollectionUtils.isEmpty(orgIPage.getRecords())){
orgIPage.getRecords().forEach(x->{
if (OrgStatusEnum.CANCEL.name().equals(x.getStatus())){
x.setStatus("false");
......@@ -87,14 +87,14 @@ public class OrganizationManageImpl implements OrganizationManageService {
query.eq("id", req.getId());
query.ne("status",OrgStatusEnum.CANCEL);
ApiOrg apiOrg = apiOrgMapper.selectOne(query);
if (null == apiOrg) {
if (null != apiOrg) {
if (OrgStatusEnum.CANCEL.name().equals(apiOrg.getStatus())) {
apiOrg.setStatus("false");
} else {
apiOrg.setStatus("true");
}
}
return Result.of_success();
return Result.of_success(apiOrg);
}
/**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment