From b437ca4b3ba3fadc821e4b01398c3257e540fcb7 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 31 十二月 2024 14:40:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/system_service/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/server/system_service/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java b/server/system_service/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java
index db49413..ea90ca1 100644
--- a/server/system_service/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java
+++ b/server/system_service/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java
@@ -42,9 +42,9 @@
@Autowired
private RedisTemplate<String,Object> redisTemplate;
@Autowired
- private JwtProperties jwtProperties;
- @Autowired
private SystemUserService systemUserService;
+ @Autowired
+ private JwtProperties jwtProperties;
@Autowired
private SystemUserRoleService systemUserRoleService;
@@ -140,7 +140,7 @@
updateUserDto.setId(dto.getId());
updateUserDto.setUpdateUser(dto.getOperaUserId());
updateUserDto.setPassword(Utils.Secure.encryptPassword(dto.getPassword(), systemUser.getSalt()));
- updateUserDto.setNeedChangePwd(Constants.ZERO);
+ updateUserDto.setNeedChangePwd(dto.getNeedChangePwd());
systemUserService.updateById(updateUserDto);
}
--
Gitblit v1.9.3