From 4cb02202b99b9d06330974acfb72fbd590882e89 Mon Sep 17 00:00:00 2001
From: Guoqs <123@jsowell.com>
Date: Thu, 11 Jul 2024 16:01:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E8=B4=A6=E5=8F=B7=E4=B8=BA=20=E6=89=8B=E6=9C=BA=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pile/service/impl/PileMerchantInfoServiceImpl.java    | 8 ++++----
 jsowell-ui/src/views/pile/merchant/index.vue              | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMerchantInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMerchantInfoServiceImpl.java
index edc2d9dc1..744a451b5 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMerchantInfoServiceImpl.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMerchantInfoServiceImpl.java
@@ -173,12 +173,12 @@ public class PileMerchantInfoServiceImpl implements PileMerchantInfoService {
 		int i = pileMerchantInfoMapper.insertPileMerchantInfo(pileMerchantInfo);
 
 		// 3 创建运营商管理员
-		if (StringUtils.isNotBlank(dto.getUserName())) {
+		if (StringUtils.isNotBlank(dto.getManagerPhone())) {
 			SysUser user = new SysUser();
 			user.setDeptId(deptId);
-			user.setUserName(dto.getUserName());
-			user.setNickName(dto.getUserName() + "运营商管理员");
-			user.setPassword(dto.getPassword());
+			user.setUserName(dto.getManagerPhone());
+			user.setNickName(dto.getMerchantName() + "-管理员");
+			user.setPassword("a" + dto.getManagerPhone());
 			user.setStatus(Constants.ZERO);
 			user.setPostIds(new Long[]{});
 			user.setRoleIds(new Long[]{3L});
diff --git a/jsowell-ui/src/views/pile/merchant/index.vue b/jsowell-ui/src/views/pile/merchant/index.vue
index c8135b14e..6dcb758f1 100644
--- a/jsowell-ui/src/views/pile/merchant/index.vue
+++ b/jsowell-ui/src/views/pile/merchant/index.vue
@@ -295,6 +295,7 @@ export default {
             message: "请输入负责人电话号码",
             trigger: "blur",
           },
+            { pattern: /^1[3456789]\d{9}$/, message: '手机号码格式不正确', trigger: 'blur' }
         ],
         servicePhone: [
           {