From 5cfca4cbb500d8c19a4291ed672cae261299e63b Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期日, 26 九月 2021 14:43:59 +0800
Subject: [PATCH] 修改提交

---
 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
index f4adeda..806bf91 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -1090,6 +1090,8 @@
                     throw new ServiceException("手机号已经存在");
                 } else if (e.getMessage().contains("union_account_type")) {
                     throw new ServiceException("账户已经存在");
+                }else if(e.getMessage().contains("23000")){
+                    throw new ServiceException("手机号已存在");
                 }
 
             }
@@ -2565,12 +2567,12 @@
     }
 
     @Override
-    public R resetPasswordPatch(Long[] userId) {
+    public R resetPasswordPatch(Long[] userId,String password) {
         if(userId!=null){
             for(Long user:userId){
                 SysUserDO sysUserDO = new SysUserDO();
                 sysUserDO.setUserId(user);
-                String encode = new BCryptPasswordEncoder().encode("admin123456");
+                String encode = new BCryptPasswordEncoder().encode(password);
                 sysUserDO.setPassword(encode);
                 userDao.updateById(sysUserDO);
             }

--
Gitblit v1.7.1