diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java index 611be45d..5a76c588 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java @@ -48,7 +48,6 @@ import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; -import org.apache.poi.ss.formula.functions.T; import org.apache.shiro.SecurityUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.BeanUtils; @@ -427,7 +426,7 @@ public class PayWorkingGroupSubItemController extends JeroController{ - // 获取工作组信息 - PayWorkingGroup payWorkingGroup = payWorkingGroupService.getById(list.get(0).getWorkingGroupId()); - if(Objects.isNull(payWorkingGroup)){ - throw new JeroBootException("工作组不存在!"); - } - SysUser sysUserInfo = sysUserService.getById(payWorkingGroup.getPrincipalIdA()); - if(Objects.isNull(sysUserInfo)){ - throw new JeroBootException("负责人不存在!"); + // 收费通知为合同的,不进行变更,其他方式直接变更 + if(Objects.equals(p.getChargeWay(),PayProjectCommon.CHARGE_WAY2)){ + return; } LambdaUpdateWrapper updatePayWorkingGroupSubItem = new LambdaUpdateWrapper<>(); // 变更应收金额,重新校验状态 @@ -832,6 +836,7 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl