From eec410247ed4b798bb03404c569e917f3114d12c Mon Sep 17 00:00:00 2001
From: liao <liao@syxysoft.com>
Date: Wed, 19 Jul 2023 10:09:26 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E4=B8=AA=E4=BA=BA=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PayContactsManagementServiceImpl.java     | 30 +++++++++++--------
 1 file changed, 18 insertions(+), 12 deletions(-)

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 d7eb20d6..87fd1770 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
@@ -126,7 +126,8 @@ public class PayContactsManagementServiceImpl extends ServiceImpl<PayContactsMan
         if(Objects.isNull(payContactsManagementOld)){
             throw new JeroBootException("联系人不存在！");
         }
-        if(!Objects.equals(payContactsManagementOld.getName(),payContactsManagement.getName())){
+        // 2023年7月需求变更（企业姓名手机号可以修改）
+        /*if(!Objects.equals(payContactsManagementOld.getName(),payContactsManagement.getName())){
             throw new JeroBootException("姓名不可修改！");
         }
         if(!Objects.equals(PasswordUtil.decrypt(payContactsManagementOld.getPhone()),payContactsManagement.getPhone())){
@@ -134,7 +135,7 @@ public class PayContactsManagementServiceImpl extends ServiceImpl<PayContactsMan
         }
         if(!Objects.equals(payContactsManagementOld.getCompanyId(),payContactsManagement.getCompanyId())){
             throw new JeroBootException("企业不可修改！");
-        }
+        }*/
 
         try {
             String phone = PasswordUtil.encrypt(payContactsManagement.getPhone());
@@ -167,16 +168,21 @@ public class PayContactsManagementServiceImpl extends ServiceImpl<PayContactsMan
 
         // 企业管理员变更，并且变更了企业，需要同步会员项目
         if(Objects.equals(payContactsManagementOld.getRoleCode(),PayContactsManagementCommon.ROLE_CODE2)){
-            // 调用会员项目接口
-            MemberInfo memberInfo = new MemberInfo();
-            memberInfo.setCompanyName(payCompanyManagement.getCompanyName());
-            memberInfo.setId(payCompanyManagement.getMemberId());
-            memberInfo.setLiaisonMan(payContactsManagement.getName());
-            memberInfo.setEmail(payContactsManagement.getEmail());
-            memberInfo.setMobile(payContactsManagement.getPhone());
-            memberInfo.setAddress(payContactsManagement.getContactAddress());
-            memberInfo.setPostcode(payContactsManagement.getPostalCode());
-            AuthenticationUtils.post("/memberInfo/memberInfo/incomingEdit","",memberInfo);
+            // 变更了企业,企业管理员不允许变更企业
+            if(!Objects.equals(payContactsManagementOld.getCompanyId(),payContactsManagement.getCompanyId())){
+                throw new JeroBootException("企业管理员不允许变更企业");
+            }else {
+                // 调用会员项目接口
+                MemberInfo memberInfo = new MemberInfo();
+                memberInfo.setCompanyName(payCompanyManagement.getCompanyName());
+                memberInfo.setId(payCompanyManagement.getMemberId());
+                memberInfo.setLiaisonMan(payContactsManagement.getName());
+                memberInfo.setEmail(payContactsManagement.getEmail());
+                memberInfo.setMobile(payContactsManagement.getPhone());
+                memberInfo.setAddress(payContactsManagement.getContactAddress());
+                memberInfo.setPostcode(payContactsManagement.getPostalCode());
+                AuthenticationUtils.post("/memberInfo/memberInfo/incomingEdit", "", memberInfo);
+            }
         }
 
         try {