From f72b3e9ead98d67d722f3dbc306736a006b12bd7 Mon Sep 17 00:00:00 2001
From: gaoqr <13665037151@163.com>
Date: Tue, 10 Sep 2024 15:01:18 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A6=85=E9=81=93=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=EF=BC=9A1=E3=80=81=E7=94=A8=E6=88=B7=E5=B7=B2?=
 =?UTF-8?q?=E5=AD=98=E5=9C=A8=E6=8F=90=E7=A4=BA=20->=20=E6=89=8B=E6=9C=BA?=
 =?UTF-8?q?=E5=8F=B7=E5=B7=B2=E5=AD=98=E5=9C=A8=EF=BC=9B2=E3=80=81?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=BB=84=E7=BB=87=E6=8B=BC=E9=9F=B3=E8=A7=A3?=
 =?UTF-8?q?=E6=9E=90=E5=BC=82=E5=B8=B8=E4=BF=AE=E5=A4=8D=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../imes/framework/common/util/pinyin/PinYinUtils.java   | 9 ++++++++-
 .../cf/imes/module/system/enums/ErrorCodeConstants.java  | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/cf-framework/cf-common/src/main/java/com/cf/imes/framework/common/util/pinyin/PinYinUtils.java b/cf-framework/cf-common/src/main/java/com/cf/imes/framework/common/util/pinyin/PinYinUtils.java
index ef231afd4..76522a0cb 100644
--- a/cf-framework/cf-common/src/main/java/com/cf/imes/framework/common/util/pinyin/PinYinUtils.java
+++ b/cf-framework/cf-common/src/main/java/com/cf/imes/framework/common/util/pinyin/PinYinUtils.java
@@ -1,11 +1,15 @@
 package com.cf.imes.framework.common.util.pinyin;
 
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ArrayUtil;
 import net.sourceforge.pinyin4j.PinyinHelper;
 import net.sourceforge.pinyin4j.format.HanyuPinyinCaseType;
 import net.sourceforge.pinyin4j.format.HanyuPinyinOutputFormat;
 import net.sourceforge.pinyin4j.format.HanyuPinyinToneType;
 import net.sourceforge.pinyin4j.format.exception.BadHanyuPinyinOutputFormatCombination;
 
+import java.util.Arrays;
+
 /**
  * @author there
  */
@@ -52,7 +56,10 @@ public class PinYinUtils {
         for (int i = 0; i < newChar.length; i++) {
             if (newChar[i] > 128) {
                 try {
-                    pinyinStr += PinyinHelper.toHanyuPinyinStringArray(newChar[i], defaultFormat)[0].charAt(0);
+                    String[] hanyuPinyinStringArray = PinyinHelper.toHanyuPinyinStringArray(newChar[i], defaultFormat);
+                    if (ArrayUtil.isNotEmpty(hanyuPinyinStringArray)) {
+                        pinyinStr += hanyuPinyinStringArray[0].charAt(0);
+                    }
                 } catch (BadHanyuPinyinOutputFormatCombination e) {
                     e.printStackTrace();
                 }
diff --git a/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/enums/ErrorCodeConstants.java b/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/enums/ErrorCodeConstants.java
index 36700bc47..7cd728a5e 100644
--- a/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/enums/ErrorCodeConstants.java
+++ b/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/enums/ErrorCodeConstants.java
@@ -36,7 +36,7 @@ public interface ErrorCodeConstants {
     ErrorCode ROLE_NOT_SUPERADMIN_NO_ORGAN_ID_OPER_ERROR = new ErrorCode(1_002_002_007, "非超管分配权限");
 
     // ========== 用户模块 1-002-003-000 ==========
-    ErrorCode USER_USERNAME_EXISTS = new ErrorCode(1_002_003_000, "用户账号已经存在");
+    ErrorCode USER_USERNAME_EXISTS = new ErrorCode(1_002_003_000, "手机号已经存在");
     ErrorCode USER_MOBILE_EXISTS = new ErrorCode(1_002_003_001, "手机号已经存在");
     ErrorCode USER_EMAIL_EXISTS = new ErrorCode(1_002_003_002, "邮箱已经存在");
     ErrorCode USER_NOT_EXISTS = new ErrorCode(1_002_003_003, "用户不存在");