From 154b2ac47a4c302699bc36990084ef22447b00d4 Mon Sep 17 00:00:00 2001 From: zzs Date: Thu, 13 Feb 2025 16:59:42 +0800 Subject: [PATCH] feat:force change password --- .../controller/admin/auth/vo/AuthPermissionInfoRespVO.java | 4 ++++ .../crm/module/system/dal/dataobject/user/AdminUserDO.java | 5 +++++ .../crm/module/system/service/user/AdminUserServiceImpl.java | 3 +++ 3 files changed, 12 insertions(+) diff --git a/ensign-module-system/ensign-module-system-biz/src/main/java/com/ensign/crm/module/system/controller/admin/auth/vo/AuthPermissionInfoRespVO.java b/ensign-module-system/ensign-module-system-biz/src/main/java/com/ensign/crm/module/system/controller/admin/auth/vo/AuthPermissionInfoRespVO.java index 866698e..bb6a94b 100644 --- a/ensign-module-system/ensign-module-system-biz/src/main/java/com/ensign/crm/module/system/controller/admin/auth/vo/AuthPermissionInfoRespVO.java +++ b/ensign-module-system/ensign-module-system-biz/src/main/java/com/ensign/crm/module/system/controller/admin/auth/vo/AuthPermissionInfoRespVO.java @@ -63,6 +63,10 @@ public class AuthPermissionInfoRespVO { @Schema(description = "用户部门拼接", requiredMode = Schema.RequiredMode.NOT_REQUIRED) private String deptIdColl; + + @Schema(description = "用户部门拼接", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + private Integer isChangePwd; + } @Schema(description = "管理后台 - 登录用户的菜单信息 Response VO") diff --git a/ensign-module-system/ensign-module-system-biz/src/main/java/com/ensign/crm/module/system/dal/dataobject/user/AdminUserDO.java b/ensign-module-system/ensign-module-system-biz/src/main/java/com/ensign/crm/module/system/dal/dataobject/user/AdminUserDO.java index 9a4ac27..2178a76 100644 --- a/ensign-module-system/ensign-module-system-biz/src/main/java/com/ensign/crm/module/system/dal/dataobject/user/AdminUserDO.java +++ b/ensign-module-system/ensign-module-system-biz/src/main/java/com/ensign/crm/module/system/dal/dataobject/user/AdminUserDO.java @@ -120,4 +120,9 @@ public class AdminUserDO extends TenantBaseDO { * 云之家OpenId */ private String openId; + + /** + * 是否修改了默认密码 + */ + private Integer isChangePwd; } diff --git a/ensign-module-system/ensign-module-system-biz/src/main/java/com/ensign/crm/module/system/service/user/AdminUserServiceImpl.java b/ensign-module-system/ensign-module-system-biz/src/main/java/com/ensign/crm/module/system/service/user/AdminUserServiceImpl.java index b4a2ff1..bd85c29 100644 --- a/ensign-module-system/ensign-module-system-biz/src/main/java/com/ensign/crm/module/system/service/user/AdminUserServiceImpl.java +++ b/ensign-module-system/ensign-module-system-biz/src/main/java/com/ensign/crm/module/system/service/user/AdminUserServiceImpl.java @@ -108,6 +108,7 @@ public class AdminUserServiceImpl implements AdminUserService { AdminUserDO user = BeanUtils.toBean(createReqVO, AdminUserDO.class); user.setStatus(CommonStatusEnum.ENABLE.getStatus()); // 默认开启 user.setPassword(encodePassword(createReqVO.getPassword())); // 加密密码 + user.setIsChangePwd(CommonStatusEnum.DISABLE.getStatus());//默认密码 userMapper.insert(user); // 2.2 插入关联岗位 if (CollectionUtil.isNotEmpty(user.getPostIds())) { @@ -182,6 +183,7 @@ public class AdminUserServiceImpl implements AdminUserService { // 执行更新 AdminUserDO updateObj = new AdminUserDO().setId(id); updateObj.setPassword(encodePassword(reqVO.getNewPassword())); // 加密密码 + updateObj.setIsChangePwd(CommonStatusEnum.ENABLE.getStatus()); userMapper.updateById(updateObj); } @@ -209,6 +211,7 @@ public class AdminUserServiceImpl implements AdminUserService { AdminUserDO updateObj = new AdminUserDO(); updateObj.setId(id); updateObj.setPassword(encodePassword(password)); // 加密密码 + updateObj.setIsChangePwd(CommonStatusEnum.DISABLE.getStatus()); userMapper.updateById(updateObj); // 3. 记录操作日志上下文