修改客户称呼会默认企微名称

fs-qw-task/src/main/java/com/fs/app/taskService/impl/SopLogsTaskServiceImpl.java

@@ -986,9 +986,13 @@ public class SopLogsTaskServiceImpl implements SopLogsTaskService {
 
 //                    } else {
                         if ("1".equals(setting.getContentType())) {
+                            String defaultName = "同学";
+                            if(contact != null && StringUtils.isNotEmpty(contact.getName()) && !"待同步客户".equals(contact.getName())){
+                                defaultName = contact.getName();
+                            }
                             setting.setValue(setting.getValue()
                                     .replaceAll("#销售称呼#", StringUtil.strIsNullOrEmpty(welcomeText) ? "" : welcomeText)
-                                    .replaceAll("#客户称呼#", contact == null || StringUtil.strIsNullOrEmpty(contact.getStageStatus())|| "0".equals(contact.getStageStatus())?"同学":contact.getStageStatus()));
+                                    .replaceAll("#客户称呼#", contact == null || StringUtil.strIsNullOrEmpty(contact.getStageStatus())|| "0".equals(contact.getStageStatus())?defaultName:contact.getStageStatus()));
                         }
 //                    }
                     break;

fs-service/src/main/java/com/fs/qw/mapper/QwExternalContactMapper.java

@@ -48,7 +48,7 @@ public interface QwExternalContactMapper extends BaseMapper<QwExternalContact> {
 
     public List<QwExternalContact> selectQwExternalContactByIds(@Param("ids") List<Long> ids);
 
-    @Select("SELECT id,stage_status,fs_user_id from qw_external_contact where id=#{id}")
+    @Select("SELECT id,stage_status,name,fs_user_id from qw_external_contact where id=#{id}")
     public QwExternalContact selectQwExternalContactByIdForStageStatus(@Param("id") Long id);
 
     @Select("SELECT\n" +

fs-service/src/main/java/com/fs/sop/service/impl/SopUserLogsInfoServiceImpl.java

@@ -902,9 +902,13 @@ public class SopUserLogsInfoServiceImpl implements ISopUserLogsInfoService {
 //                                }
 //                            }else {
                                 if ("1".equals(st.getContentType())) {
+                                    String defaultName = "同学";
+                                    if(contact != null && StringUtils.isNotEmpty(contact.getName()) && !"待同步客户".equals(contact.getName())){
+                                        defaultName = contact.getName();
+                                    }
                                     st.setValue(st.getValue()
                                             .replaceAll("#销售称呼#",StringUtil.strIsNullOrEmpty(qwUser.getWelcomeText())?"":qwUser.getWelcomeText())
-                                            .replaceAll("#客户称呼#",StringUtil.strIsNullOrEmpty(contact.getStageStatus()) || "0".equals(contact.getStageStatus())?"同学":contact.getStageStatus()));
+                                            .replaceAll("#客户称呼#",contact == null || StringUtil.strIsNullOrEmpty(contact.getStageStatus()) || "0".equals(contact.getStageStatus())?defaultName:contact.getStageStatus()));
                                 }
 //                            }
 
@@ -1335,9 +1339,13 @@ public class SopUserLogsInfoServiceImpl implements ISopUserLogsInfoService {
 //                        }
 //                    }else {
                         if ("1".equals(st.getContentType())) {
+                            String defaultName = "同学";
+                            if(contact != null && StringUtils.isNotEmpty(contact.getName()) && !"待同步客户".equals(contact.getName())){
+                                defaultName = contact.getName();
+                            }
                             st.setValue(st.getValue()
                                     .replaceAll("#销售称呼#",StringUtil.strIsNullOrEmpty(qwUser.getWelcomeText())?"":qwUser.getWelcomeText())
-                                    .replaceAll("#客户称呼#",StringUtil.strIsNullOrEmpty(contact.getStageStatus()) || "0".equals(contact.getStageStatus())?"同学":contact.getStageStatus()));
+                                    .replaceAll("#客户称呼#",contact == null || StringUtil.strIsNullOrEmpty(contact.getStageStatus()) || "0".equals(contact.getStageStatus())?defaultName:contact.getStageStatus()));
                         }
 //                    }