From 1d68d2eec415e5f4ef508033ded1dbead1d300ae Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期四, 09 四月 2026 14:12:39 +0800
Subject: [PATCH] feat(staff): 支持默认密码设置并完善用户信息关联
---
src/main/java/com/ruoyi/staff/dto/StaffOnJobDto.java | 3 +++
src/main/java/com/ruoyi/staff/service/impl/StaffOnJobServiceImpl.java | 3 ++-
src/main/java/com/ruoyi/project/system/controller/SysUserController.java | 1 +
3 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/project/system/controller/SysUserController.java b/src/main/java/com/ruoyi/project/system/controller/SysUserController.java
index 8b01634..e0d44c6 100644
--- a/src/main/java/com/ruoyi/project/system/controller/SysUserController.java
+++ b/src/main/java/com/ruoyi/project/system/controller/SysUserController.java
@@ -131,6 +131,7 @@
sysUserDeptVo.setUserId(userId);
List<SysUserDeptVo> sysUserDeptVos = userDeptService.userLoginFacotryList(sysUserDeptVo);
ajax.put("deptIds",sysUserDeptVos.stream().map(SysUserDeptVo::getDeptId).collect(Collectors.toList()));
+ ajax.put("deptId",sysUserDeptVos.stream().map(SysUserDeptVo::getDeptId).collect(Collectors.toList()).get(0));
return ajax;
}
diff --git a/src/main/java/com/ruoyi/staff/dto/StaffOnJobDto.java b/src/main/java/com/ruoyi/staff/dto/StaffOnJobDto.java
index 0a2c0ae..e5e63df 100644
--- a/src/main/java/com/ruoyi/staff/dto/StaffOnJobDto.java
+++ b/src/main/java/com/ruoyi/staff/dto/StaffOnJobDto.java
@@ -25,4 +25,7 @@
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date contractEndTime;
+
+
+ private String defaultPassword;
}
diff --git a/src/main/java/com/ruoyi/staff/service/impl/StaffOnJobServiceImpl.java b/src/main/java/com/ruoyi/staff/service/impl/StaffOnJobServiceImpl.java
index 8336f90..b094355 100644
--- a/src/main/java/com/ruoyi/staff/service/impl/StaffOnJobServiceImpl.java
+++ b/src/main/java/com/ruoyi/staff/service/impl/StaffOnJobServiceImpl.java
@@ -106,7 +106,7 @@
SysUser sysUser1 = new SysUser();
sysUser1.setUserName(staffOnJobPrams.getStaffNo());
sysUser1.setNickName(staffOnJobPrams.getStaffName());
- String s = SecurityUtils.encryptPassword("123456");
+ String s = SecurityUtils.encryptPassword(staffOnJobPrams.getDefaultPassword());
sysUser1.setPassword(s);
if(staffOnJobPrams.getSysPostId() != null){
Long[] posts = new Long[]{staffOnJobPrams.getSysPostId().longValue()};
@@ -115,6 +115,7 @@
sysUser1.setRoleIds(new Long[]{staffOnJobPrams.getRoleId()});
sysUser1.setDeptIds(new Long[]{staffOnJobPrams.getSysDeptId()});
sysUser1.setStatus("0");
+ sysUser1.setPhonenumber(staffOnJobPrams.getPhone());
sysUserService.insertUser(sysUser1);
}
// 缁戝畾瀛愯〃鏁版嵁
--
Gitblit v1.9.3