Merge remote-tracking branch 'origin/master'

jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java

@@ -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)){

jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java

@@ -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);