diff --git a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/system/base/controller/JeroController.java b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/system/base/controller/JeroController.java index d72d8475..48f0f969 100644 --- a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/system/base/controller/JeroController.java +++ b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/system/base/controller/JeroController.java @@ -228,6 +228,9 @@ public class JeroController> { try { //导入Excel格式校验,看匹配的字段文本概率 Boolean t = ExcelImportCheckUtil.check(file.getInputStream(), clazz, params); + if (t == null) { + throw new JeroBootException("导入数据为空!"); + } if(!t){ throw new JeroBootException("导入Excel校验失败 !"); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/PayPayMemberProjectSubitemServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/PayPayMemberProjectSubitemServiceImpl.java index 0bc58f1c..a99925d5 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/PayPayMemberProjectSubitemServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/PayPayMemberProjectSubitemServiceImpl.java @@ -1,5 +1,6 @@ package com.jero.member.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.jero.common.exception.JeroBootException; import com.jero.common.util.ValidUtil; import com.jero.company.entity.PayContactsManagement; @@ -54,6 +55,14 @@ public class PayPayMemberProjectSubitemServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(PayMemberProjectSubitem::getProjectId,projectId); + wrapper.eq(PayMemberProjectSubitem::getCompanyId,companyId); + int count = count(wrapper); + if (count>0){ + throw new JeroBootException("会员单位已经存在"); + } validMemberProjectSubitem(payMemberProjectSubitem); //实收金额 payMemberProjectSubitem.setPaidAmount(0);