From 06e79d606369482eea8c303649f0c59f339812e9 Mon Sep 17 00:00:00 2001
From: liangqitao <12345678>
Date: Tue, 14 Dec 2021 13:43:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=A7=92=E8=89=B2=E4=BD=93?=
 =?UTF-8?q?=E7=B3=BB=EF=BC=9A=E5=8C=85=E5=90=AB=E4=BC=81=E4=B8=9A=E8=81=94?=
 =?UTF-8?q?=E7=B3=BB=E4=BA=BA=E3=80=81=E4=BC=81=E4=B8=9A=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../company/controller/PayContactsManagementController.java   | 3 +++
 .../service/impl/PayContactsManagementServiceImpl.java        | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java
index 8f7790b6..e28fff6d 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java
@@ -252,6 +252,9 @@ public class PayContactsManagementController extends JeroController<PayContactsM
 		// 企业管理员变更需要同步会员项目
 		if(Objects.equals(payContactsManagementOld.getRoleCode(),PayContactsManagementCommon.ROLE_CODE2)
 				&& StringUtils.isBlank(payContactsManagement.getFlagStatus())){
+			if(!Objects.equals(payContactsManagementOld.getCompanyId(),payContactsManagement.getCompanyId())){
+				return Result.error("会员人员不可变更企业！");
+			}
 			// 调用会员项目接口
 			MemberInfo memberInfo = new MemberInfo();
 			memberInfo.setCompanyName(payCompanyManagement.getCompanyName());
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayContactsManagementServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayContactsManagementServiceImpl.java
index 60d31b28..56cd4fa0 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayContactsManagementServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayContactsManagementServiceImpl.java
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jero.common.api.vo.Result;
 import com.jero.common.exception.JeroBootException;
 import com.jero.common.system.api.ISysBaseAPI;
 import com.jero.common.system.util.JwtUtil;
@@ -133,6 +134,9 @@ public class PayContactsManagementServiceImpl extends ServiceImpl<PayContactsMan
         // 企业管理员变更需要同步会员项目
         if(Objects.equals(payContactsManagementOld.getRoleCode(),PayContactsManagementCommon.ROLE_CODE2)
                 && StringUtils.isBlank(payContactsManagement.getFlagStatus())){
+            if(!Objects.equals(payContactsManagementOld.getCompanyId(),payContactsManagement.getCompanyId())){
+                throw new JeroBootException("会员人员不可变更企业！");
+            }
             // 调用会员项目接口
             MemberInfo memberInfo = new MemberInfo();
             memberInfo.setCompanyName(payCompanyManagement.getCompanyName());