|
@@ -161,17 +161,17 @@ public class ContractInfoController extends BladeController {
|
|
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
|
|
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
|
|
List<WbsTreeContract> wbsTreeContracts = wbsTreeContractService.findWbsTreeContract(ids);
|
|
List<WbsTreeContract> wbsTreeContracts = wbsTreeContractService.findWbsTreeContract(ids);
|
|
if (wbsTreeContracts.size() > 0) {
|
|
if (wbsTreeContracts.size() > 0) {
|
|
- return R.fail("合同段存在关联的WBS树,删除失败");
|
|
|
|
|
|
+ return R.fail("合同段存在关联的WBS树,删除失败");
|
|
}
|
|
}
|
|
Long list = saveUserInfoByProjectMapper.selectCount(Wrappers.<SaveUserInfoByProjectDTO>query().lambda()
|
|
Long list = saveUserInfoByProjectMapper.selectCount(Wrappers.<SaveUserInfoByProjectDTO>query().lambda()
|
|
.eq(SaveUserInfoByProjectDTO::getContractId, ids)
|
|
.eq(SaveUserInfoByProjectDTO::getContractId, ids)
|
|
);
|
|
);
|
|
if (list > 0L) {
|
|
if (list > 0L) {
|
|
- return R.fail("当前合同段存在关联用户,删除失败");
|
|
|
|
|
|
+ return R.fail("当前合同段存在关联用户,删除失败");
|
|
}
|
|
}
|
|
Integer list2 = saveUserInfoByProjectMapper.selectSGJL(ids);
|
|
Integer list2 = saveUserInfoByProjectMapper.selectSGJL(ids);
|
|
if (list2 > 0) {
|
|
if (list2 > 0) {
|
|
- return R.fail("当前监理合同段存在关联的施工合同信息,删除失败");
|
|
|
|
|
|
+ return R.fail("当前监理合同段存在关联的施工合同信息,删除失败");
|
|
}
|
|
}
|
|
return R.status(contractInfoService.deleteLogic(Func.toLongList(ids)));
|
|
return R.status(contractInfoService.deleteLogic(Func.toLongList(ids)));
|
|
}
|
|
}
|