From 07528ce0fa29b051e626acfa6e7c02f3c0c7b88e Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Mon, 6 Sep 2021 10:54:32 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E4=BC=9A=E5=91=98=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E6=88=90=E5=91=98=E5=AF=BC=E5=85=A5=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/system/base/controller/JeroController.java    | 3 +++
 .../impl/PayPayMemberProjectSubitemServiceImpl.java      | 9 +++++++++
 2 files changed, 12 insertions(+)

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<T, S extends IService<T>> {
             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<PayMember
 		if (memberProject == null){
 			throw new JeroBootException("会员项目不存在");
 		}
+		String companyId = payMemberProjectSubitem.getCompanyId();
+		LambdaQueryWrapper<PayMemberProjectSubitem> 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);