From e28496a745883f0d7b3db5832841ffb6f98e738a Mon Sep 17 00:00:00 2001
From: RuicyWu <1063154311@qq.com>
Date: Thu, 27 Nov 2025 11:38:11 +0800
Subject: [PATCH] fix bug

---
 .../handler/CusInfoChangeHandler.java           | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/v5/apps-customize/src/main/java/com/seeyon/apps/src_receiveFVFlow/handler/CusInfoChangeHandler.java b/v5/apps-customize/src/main/java/com/seeyon/apps/src_receiveFVFlow/handler/CusInfoChangeHandler.java
index 4756daf..96973fd 100644
--- a/v5/apps-customize/src/main/java/com/seeyon/apps/src_receiveFVFlow/handler/CusInfoChangeHandler.java
+++ b/v5/apps-customize/src/main/java/com/seeyon/apps/src_receiveFVFlow/handler/CusInfoChangeHandler.java
@@ -25,6 +25,7 @@ import com.seeyon.ctp.organization.manager.OrgManagerDirect;
 import com.seeyon.ctp.services.ServiceException;
 import com.seeyon.v3x.services.form.bean.FormExport;
 import com.seeyon.v3x.services.form.bean.ValueExport;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -125,7 +126,7 @@ public class CusInfoChangeHandler extends FlowDataSyncHandler implements Custome
         if(member == null) {
             throw new RuntimeException("客户老板账号不存在");
         }
-        if(!preEditedPhone.equals(postEditedPhone) && postEditedPhone != null) {
+        if(StringUtils.isNotBlank(postEditedPhone) && !postEditedPhone.equals(preEditedPhone)) {
             member.setTelNumber(postEditedPhone);
             member.setCode(postEditedPhone);
             V3xOrgMember byLoginName = orgManager.getMemberByLoginName(postEditedPhone);
@@ -136,7 +137,7 @@ public class CusInfoChangeHandler extends FlowDataSyncHandler implements Custome
             v3xOrgPrincipal.setLoginName(postEditedPhone);
             member.setV3xOrgPrincipal(v3xOrgPrincipal);
         }
-        if(!preEditedDeptName.equals(postEditedDeptName) && postEditedDeptName != null) {
+        if(StringUtils.isNotBlank(postEditedDeptName) && !postEditedDeptName.equals(preEditedDeptName)) {
             V3xOrgDepartment department = departmentManager.getById(fqzDept);
             department.setName(postEditedDeptName);
             mainFormData.put("部门名称",postEditedDeptName);
@@ -144,7 +145,7 @@ public class CusInfoChangeHandler extends FlowDataSyncHandler implements Custome
         }else {
             mainFormData.put("部门名称",preEditedDeptName);
         }
-        if(postEditedLegalPerson != null && !preEditedLegalPerson.equals(postEditedLegalPerson)) {
+        if(StringUtils.isNotBlank(postEditedLegalPerson) && !postEditedLegalPerson.equals(preEditedLegalPerson)) {
             member.setName(postEditedLegalPerson);
         }
         mainFormData.put("岗位",member.getOrgPostId());
@@ -171,14 +172,16 @@ public class CusInfoChangeHandler extends FlowDataSyncHandler implements Custome
         String postEditedLegalPersonCardNo = (String) mainFormData.get("法人身份证号");
         String postEditedPhone = (String) mainFormData.get("法人电话");
         String preEditedPhone = (String) mainFormData.get("变更前法人手机号");
-
-        if(postEditedLegalPersonCardNo != null && (preEditedLegalPersonCardNo == null || !preEditedLegalPersonCardNo.equals(postEditedLegalPersonCardNo))) {
+        if(StringUtils.isBlank(preEditedLegalPerson)) {
+            return;
+        }
+        if(StringUtils.isNotBlank(postEditedLegalPersonCardNo) && !postEditedLegalPersonCardNo.equals(preEditedLegalPersonCardNo)) {
             Map<String,Object> personMap = new HashMap<>();
             personMap.put("岗位",mainFormData.get("岗位"));
             personMap.put("单位",mainFormData.get("单位"));
             personMap.put("部门",mainFormData.get("部门"));
             personMap.put("部门名称",mainFormData.get("部门名称"));
-            personMap.put("姓名文本",postEditedLegalPerson);
+            personMap.put("姓名文本", StringUtils.isBlank(postEditedLegalPerson) ? preEditedLegalPerson : postEditedLegalPerson);
             personMap.put("身份证号码",postEditedLegalPersonCardNo);
             personMap.put("员工状态", EnumMapUtils.getMasterTableEnumItemValue(formNo,"员工状态","入职"));
             personMap.put("手机号",postEditedPhone != null && (preEditedPhone == null || !preEditedPhone.equals(postEditedPhone)) ? postEditedPhone : preEditedPhone);
@@ -191,7 +194,7 @@ public class CusInfoChangeHandler extends FlowDataSyncHandler implements Custome
             formExport.setSubordinateForms(formExportUtil.setAllSubordinateFormValue(subFormDatas));
             getFormFactory().importBusinessFormData(loginName, formNo,
                     formExport, new String[] {});
-        }else {
+        }else if(StringUtils.isNotBlank(postEditedPhone)){
             List<FormWhereCondition> conditions = new ArrayList<>();
             List<FormUpdateField> updateFields = new ArrayList<>();
             conditions.add(FormWhereCondition.build().display("身份证号码").value(preEditedLegalPersonCardNo));