|
@@ -136,17 +136,17 @@ public class AdmFloorController {
|
|
|
|
|
|
admQueryCriteria.setName(AdmSpace.OBJ_TYPE);
|
|
admQueryCriteria.setName(AdmSpace.OBJ_TYPE);
|
|
AdmResponse admResponseSpace = spaceService.query(admQueryCriteria);
|
|
AdmResponse admResponseSpace = spaceService.query(admQueryCriteria);
|
|
- if(admResponseSpace.getResult().equals(DmpResult.SUCCESS) && CollUtil.isNotEmpty(admResponseSpace.getContent())){
|
|
|
|
|
|
+ if(admResponseSpace.getResult().equals(DmpResult.SUCCESS) && admResponseSpace.getCount() > 0){
|
|
return AdmResponse.failure(msg);
|
|
return AdmResponse.failure(msg);
|
|
}
|
|
}
|
|
admQueryCriteria.setName(AdmISpace.OBJ_TYPE);
|
|
admQueryCriteria.setName(AdmISpace.OBJ_TYPE);
|
|
AdmResponse admResponseISpace = iAdmISpaceService.doQuery(AdmContextUtil.toDmpContext(), admQueryCriteria, AdmISpace.class);
|
|
AdmResponse admResponseISpace = iAdmISpaceService.doQuery(AdmContextUtil.toDmpContext(), admQueryCriteria, AdmISpace.class);
|
|
- if(admResponseISpace.getResult().equals(DmpResult.SUCCESS) && CollUtil.isNotEmpty(admResponseISpace.getContent())){
|
|
|
|
|
|
+ if(admResponseISpace.getResult().equals(DmpResult.SUCCESS) && admResponseSpace.getCount() > 0){
|
|
return AdmResponse.failure(msg);
|
|
return AdmResponse.failure(msg);
|
|
}
|
|
}
|
|
admQueryCriteria.setName(AdmEquipment.OBJ_TYPE);
|
|
admQueryCriteria.setName(AdmEquipment.OBJ_TYPE);
|
|
AdmResponse admResponseEuip = equipmentService.query(admQueryCriteria);
|
|
AdmResponse admResponseEuip = equipmentService.query(admQueryCriteria);
|
|
- if(admResponseEuip.getResult().equals(DmpResult.SUCCESS) && CollUtil.isNotEmpty(admResponseEuip.getContent())){
|
|
|
|
|
|
+ if(admResponseEuip.getResult().equals(DmpResult.SUCCESS) && admResponseSpace.getCount() > 0){
|
|
return AdmResponse.failure(msg);
|
|
return AdmResponse.failure(msg);
|
|
}
|
|
}
|
|
service.doDelete(AdmContextUtil.toDmpContext(), vos);
|
|
service.doDelete(AdmContextUtil.toDmpContext(), vos);
|
|
@@ -161,8 +161,8 @@ public class AdmFloorController {
|
|
*/
|
|
*/
|
|
@PostMapping("/single/delete")
|
|
@PostMapping("/single/delete")
|
|
public AdmResponse deleteSingle( @RequestBody List<AdmFloor> vos) throws Exception {
|
|
public AdmResponse deleteSingle( @RequestBody List<AdmFloor> vos) throws Exception {
|
|
- delete(vos);
|
|
|
|
- return AdmResponse.success();
|
|
|
|
|
|
+
|
|
|
|
+ return delete(vos);
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|