From 161e27e08b1495c04cd3f35906c1d7dd873f1d60 Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期一, 17 一月 2022 11:38:20 +0800
Subject: [PATCH] 商业街bug修改

---
 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java |    4 +++-
 1 files changed, 3 insertions(+), 1 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 82d2a14..7a5d5a4 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
@@ -2825,12 +2825,13 @@
                 .eq(SysUserDO::getPhone, mcsMerchantDTO.getPhone()).eq(SysUserDO::getType, 11));
         String encode = new BCryptPasswordEncoder().encode(mcsMerchantDTO.getPassword());
         if (nonNull(sysUserDO)) {
-            BeanUtils.copyProperties(mcsMerchantDTO, sysUserDO);
             sysUserDO.setAccount(mcsMerchantDTO.getAccount());
             sysUserDO.setStatus(mcsMerchantDTO.getAccountStatus());
             sysUserDO.setPhone(mcsMerchantDTO.getPhone());
             sysUserDO.setPassword(encode);
             sysUserDO.setPlaintextPassword(mcsMerchantDTO.getPassword());
+            sysUserDO.setImageUrl(mcsMerchantDTO.getLogo());
+            sysUserDO.setName(mcsMerchantDTO.getName());
             userDao.updateById(sysUserDO);
             McsLoginUserInfoVO loginUserInfoVO = new McsLoginUserInfoVO();
             BeanUtils.copyProperties(sysUserDO, loginUserInfoVO);
@@ -2846,6 +2847,7 @@
         sysUserDO.setPhone(mcsMerchantDTO.getPhone());
         sysUserDO.setPassword(encode);
         sysUserDO.setPlaintextPassword(mcsMerchantDTO.getPassword());
+        sysUserDO.setImageUrl(mcsMerchantDTO.getLogo());
         try {
             userDao.insert(sysUserDO);
             McsLoginUserInfoVO loginUserInfoVO = new McsLoginUserInfoVO();

--
Gitblit v1.7.1