收入合同项目列表查询修改
This commit is contained in:
+1
-1
@@ -374,7 +374,7 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
|
||||
throw new JeroBootException("关联id不能为空!");
|
||||
}
|
||||
PayIncomeContractAssociated payIncomeContractAssociated = payIncomeContractAssociatedService.getById(input.getId());
|
||||
if(Objects.equals(input.getContractId(),payIncomeContractAssociated.getContractId())){
|
||||
if(!Objects.equals(input.getContractId(),payIncomeContractAssociated.getContractId())){
|
||||
throw new JeroBootException("关联id不能为空!");
|
||||
}
|
||||
if(Objects.isNull(payIncomeContractAssociated)){
|
||||
|
||||
+1
-1
@@ -115,7 +115,7 @@ public class PayWorkingGroupController extends JeroController<PayWorkingGroup, I
|
||||
return Result.error("企业id不能为空!");
|
||||
}
|
||||
List<PayWorkingGroupVO> list = payWorkingGroupService.queryListByCompany(companyId,workingGroupProject,year, PayProjectCommon.PROJECT_TYPE2);
|
||||
if(CollectionUtils.isEmpty(list)){
|
||||
if(!CollectionUtils.isEmpty(list)){
|
||||
setPayWorkingGroupSubItem(list);
|
||||
}
|
||||
return Result.OK(list);
|
||||
|
||||
Reference in New Issue
Block a user