From 29167f6c5d895749f369fadbcd4b3c0a3a17052c Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期三, 14 九月 2022 15:40:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/sanshuohuitang_dev' into sanshuohuitang_dev
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 8 +++++---
1 files changed, 5 insertions(+), 3 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 d54450b..46d3f5c 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
@@ -3679,7 +3679,9 @@
if (nonNull(administratorsUserVO.getImageUrl())){
sysUserDO.setImageUrl(administratorsUserVO.getImageUrl());
}
- sysUserDO.setType(administratorsUserVO.getType());
+ if (nonNull(administratorsUserVO.getType())){
+ sysUserDO.setType(administratorsUserVO.getType());
+ }
userDao.insert(sysUserDO);
return R.ok();
}
@@ -3690,8 +3692,8 @@
* 三说会堂后台重置密码
* */
@Override
- public R resetPassExpertOrIndustryCenter(Long userId,String password) {
- SysUserDO sysUserDO = userDao.selectById(userId);
+ public R resetPassExpertOrIndustryCenter(String account,String password) {
+ SysUserDO sysUserDO = userDao.selectOne(new QueryWrapper<SysUserDO>().eq("account", account));
if (nonNull(sysUserDO)){
sysUserDO.setPassword(password);
userDao.updateById(sysUserDO);
--
Gitblit v1.7.1