From 894cc9f240749e73d016a397d5534cc237fbb88b Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期三, 06 七月 2022 11:01:55 +0800
Subject: [PATCH] 防疫报备更新

---
 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java |   31 +++++++++++++++++++++----------
 1 files changed, 21 insertions(+), 10 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 643fe21..16408c2 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
@@ -250,17 +250,20 @@
      */
     @Override
     public R updateUserWeiXinPhone(Long userId, String purePhoneNumber) {
-        SysUserDO sysUserDO = new SysUserDO();
-        sysUserDO.setPhone(purePhoneNumber);
-        sysUserDO.setUserId(userId);
-        userDao.updateMemberRole(purePhoneNumber, purePhoneNumber);
-        userDao.updateServiceTeam(purePhoneNumber, purePhoneNumber);
-        int i = userDao.updateById(sysUserDO);
-        if (i > 0) {
-            return R.ok(purePhoneNumber);
-        } else {
-            return R.fail("维护微信手机号失败");
+        SysUserDO sysUserDO=userDao.selectById(userId);
+        if(sysUserDO!=null){
+            userDao.updateMemberRole(purePhoneNumber, sysUserDO.getPhone());
+            userDao.updateServiceTeam(purePhoneNumber, sysUserDO.getPhone());
+            sysUserDO.setPhone(purePhoneNumber);
+            sysUserDO.setUserId(userId);
+            int i = userDao.updateById(sysUserDO);
+            if (i > 0) {
+                return R.ok(purePhoneNumber);
+            } else {
+                return R.fail("维护微信手机号失败");
+            }
         }
+        return R.ok(sysUserDO.getPhone());
     }
 
     /**
@@ -3280,4 +3283,12 @@
         }
         return R.fail("信息错误");
     }
+
+    @Override
+    public R checkExport(String account, String password,String oldPassword) {
+        if(new BCryptPasswordEncoder().matches(password, oldPassword)){
+            return R.ok();
+        }
+        return R.fail();
+    }
 }

--
Gitblit v1.7.1