From 7e111d89994c16cc87d2750690e71d0588665360 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期二, 08 六月 2021 13:05:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test

---
 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 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 57d00be..8e518d3 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
@@ -1928,9 +1928,9 @@
             e.printStackTrace();
             log.error("新增后台用户报错【{}】", e.getMessage());
             if (e.getMessage().contains("union_phone_type")) {
-                throw new ServiceException("手机号已经存在");
+                return R.fail("手机号已经存在");
             } else if (e.getMessage().contains("union_account_type")) {
-                throw new ServiceException("账户已经存在");
+                return R.fail("账户已经存在");
             }
         }
         if(insert > 0){
@@ -1983,9 +1983,9 @@
             e.printStackTrace();
             log.error("修改网格员用户报错【{}】", e.getMessage());
             if (e.getMessage().contains("union_phone_type")) {
-                throw new ServiceException("手机号已经存在");
+                return R.fail("手机号已经存在");
             } else if (e.getMessage().contains("union_account_type")) {
-                throw new ServiceException("账户已经存在");
+                return R.fail("账户已经存在");
             }
         }
         if(insert > 0){

--
Gitblit v1.7.1