hansha
/
kaohe
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
main
wanglei 2 months ago
parent 8332ddd5a8 73a58bdba5
commit 225f9a697d
5 changed files with 185 additions and 106 deletions
Show Stats Download Patch File Download Diff File

4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
Unescape View File

@ -231,10 +231,6 @@ public class SysUserController extends BaseController
@DeleteMapping("/pcIds/{pcIds}")
public AjaxResult removeBypcIds(@PathVariable Long[] pcIds)
{
if (ArrayUtils.contains(pcIds, getUserId()))
{
return error("当前用户不能删除");
}
return toAjax(userService.deleteUserByPcIds(pcIds));
}

244
ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/domain/KhEmployee.java
Unescape View File

@ -7,246 +7,288 @@ import com.ruoyi.common.core.domain.BaseEntity;
/**
* 职工信息对象 kh_employee
*
*
* @author hs
* @date 2025-06-17
*/
public class KhEmployee extends BaseEntity
{
public class KhEmployee extends BaseEntity {
private static final long serialVersionUID = 1L;
/** 主键 */
/**
* 主键
*/
private Long id;
/** 登录用户id */
/**
* 登录用户id
*/
//@Excel(name = "登录用户id")
private Long userId;
/** 职工所属部门 */
/**
* 职工所属部门
*/
@Excel(name = "职工所属部门")
private Long deptId;
/** 部门名称 */
/**
* 部门名称
*/
@Excel(name = "部门名称")
private String deptName;
/** 职工姓名 */
/**
* 职工姓名
*/
@Excel(name = "职工姓名")
private String empName;
/** 性别（0：男 1：女) */
@Excel(name = "性别(男/女/未知)",readConverterExp = "0=男,1=女,2=未知")
/**
* 工号
*/
@Excel(name = "工号")
private String wordId;
/**
* 职位
*/
@Excel(name = "职位")
private String position;
/**
* 性别（0：男 1：女)
*/
@Excel(name = "性别(男/女/未知)", readConverterExp = "0=男,1=女,2=未知")
private String sex;
/** 年龄 */
/**
* 年龄
*/
@Excel(name = "年龄")
private Long age;
/** 手机号 */
/**
* 手机号
*/
@Excel(name = "手机号")
private String phone;
/** 身份证号 */
/**
* 身份证号
*/
@Excel(name = "身份证号")
private String idcard;
/** 银行卡号 */
/**
* 银行卡号
*/
@Excel(name = "银行卡号")
private String bankCardNumber;
/** 开户行 */
/**
* 开户行
*/
@Excel(name = "开户行")
private String openingBank;
/** 学历 */
/**
* 学历
*/
@Excel(name = "学历")
private String education;
/** 家庭住址 */
/** 文档 */
@Excel(name = "文档")
private String docs;
/**
* 家庭住址
*/
@Excel(name = "家庭住址")
private String address;
/** 紧急联系人 */
/**
* 紧急联系人
*/
@Excel(name = "紧急联系人")
private String contact;
/** 紧急联系人电话 */
/**
* 紧急联系人电话
*/
@Excel(name = "紧急联系人电话")
private String contactPhone;
public void setId(Long id)
{
public String getWordId() {
return wordId;
}
public void setWordId(String wordId) {
this.wordId = wordId;
}
public String getDocs() {
return docs;
}
public void setDocs(String docs) {
this.docs = docs;
}
public String getPosition() {
return position;
}
public void setPosition(String position) {
this.position = position;
}
public void setId(Long id) {
this.id = id;
}
public Long getId()
{
public Long getId() {
return id;
}
public void setUserId(Long userId)
{
public void setUserId(Long userId) {
this.userId = userId;
}
public Long getUserId()
{
public Long getUserId() {
return userId;
}
public void setDeptId(Long deptId)
{
public void setDeptId(Long deptId) {
this.deptId = deptId;
}
public Long getDeptId()
{
public Long getDeptId() {
return deptId;
}
public void setDeptName(String deptName)
{
public void setDeptName(String deptName) {
this.deptName = deptName;
}
public String getDeptName()
{
public String getDeptName() {
return deptName;
}
public void setEmpName(String empName)
{
public void setEmpName(String empName) {
this.empName = empName;
}
public String getEmpName()
{
public String getEmpName() {
return empName;
}
public void setSex(String sex)
{
public void setSex(String sex) {
this.sex = sex;
}
public String getSex()
{
public String getSex() {
return sex;
}
public void setAge(Long age)
{
public void setAge(Long age) {
this.age = age;
}
public Long getAge()
{
public Long getAge() {
return age;
}
public void setPhone(String phone)
{
public void setPhone(String phone) {
this.phone = phone;
}
public String getPhone()
{
public String getPhone() {
return phone;
}
public void setIdcard(String idcard)
{
public void setIdcard(String idcard) {
this.idcard = idcard;
}
public String getIdcard()
{
public String getIdcard() {
return idcard;
}
public void setBankCardNumber(String bankCardNumber)
{
public void setBankCardNumber(String bankCardNumber) {
this.bankCardNumber = bankCardNumber;
}
public String getBankCardNumber()
{
public String getBankCardNumber() {
return bankCardNumber;
}
public void setOpeningBank(String openingBank)
{
public void setOpeningBank(String openingBank) {
this.openingBank = openingBank;
}
public String getOpeningBank()
{
public String getOpeningBank() {
return openingBank;
}
public void setEducation(String education)
{
public void setEducation(String education) {
this.education = education;
}
public String getEducation()
{
public String getEducation() {
return education;
}
public void setAddress(String address)
{
public void setAddress(String address) {
this.address = address;
}
public String getAddress()
{
public String getAddress() {
return address;
}
public void setContact(String contact)
{
public void setContact(String contact) {
this.contact = contact;
}
public String getContact()
{
public String getContact() {
return contact;
}
public void setContactPhone(String contactPhone)
{
public void setContactPhone(String contactPhone) {
this.contactPhone = contactPhone;
}
public String getContactPhone()
{
public String getContactPhone() {
return contactPhone;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("userId", getUserId())
.append("deptId", getDeptId())
.append("deptName", getDeptName())
.append("empName", getEmpName())
.append("sex", getSex())
.append("age", getAge())
.append("phone", getPhone())
.append("idcard", getIdcard())
.append("bankCardNumber", getBankCardNumber())
.append("openingBank", getOpeningBank())
.append("education", getEducation())
.append("address", getAddress())
.append("contact", getContact())
.append("contactPhone", getContactPhone())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.append("remark", getRemark())
.toString();
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("userId", getUserId())
.append("deptId", getDeptId())
.append("deptName", getDeptName())
.append("empName", getEmpName())
.append("wordId", getWordId())
.append("position", getPosition())
.append("sex", getSex())
.append("age", getAge())
.append("phone", getPhone())
.append("idcard", getIdcard())
.append("bankCardNumber", getBankCardNumber())
.append("openingBank", getOpeningBank())
.append("education", getEducation())
.append("docs", getDocs())
.append("address", getAddress())
.append("contact", getContact())
.append("contactPhone", getContactPhone())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.append("remark", getRemark())
.toString();
}
}

17
ruoyi-kaohe/src/main/resources/mapper/kaohe/KhEmployeeMapper.xml
Unescape View File

@ -10,6 +10,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="deptId" column="dept_id" />
<result property="deptName" column="dept_name" />
<result property="empName" column="emp_name" />
<result property="wordId" column="word_id" />
<result property="position" column="position" />
<result property="sex" column="sex" />
<result property="age" column="age" />
<result property="phone" column="phone" />
@ -17,6 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="bankCardNumber" column="bank_card_number" />
<result property="openingBank" column="opening_bank" />
<result property="education" column="education" />
<result property="docs" column="docs" />
<result property="address" column="address" />
<result property="contact" column="contact" />
<result property="contactPhone" column="contact_phone" />
@ -28,7 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectKhEmployeeVo">
select id, user_id, dept_id, dept_name, emp_name, sex, age, phone, idcard, bank_card_number, opening_bank, education, address, contact, contact_phone, create_by, create_time, update_by, update_time, remark from kh_employee
select id, user_id, dept_id, dept_name, emp_name,word_id, `position`, sex, age, phone, idcard, bank_card_number, opening_bank, education,docs, address, contact, contact_phone, create_by, create_time, update_by, update_time, remark from kh_employee
</sql>
<select id="selectKhEmployeeList" parameterType="KhEmployee" resultMap="KhEmployeeResult">
@ -38,6 +41,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="deptId != null "> and dept_id = #{deptId}</if>
<if test="deptName != null and deptName != ''"> and dept_name like concat('%', #{deptName}, '%')</if>
<if test="empName != null and empName != ''"> and emp_name like concat('%', #{empName}, '%')</if>
<if test="wordId != null and wordId != ''"> and word_id = #{wordId}</if>
<if test="position != null and position != ''"> and `position` = #{position}</if>
<if test="sex != null and sex != ''"> and sex = #{sex}</if>
<if test="age != null "> and age = #{age}</if>
<if test="phone != null and phone != ''"> and phone = #{phone}</if>
@ -45,6 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="bankCardNumber != null and bankCardNumber != ''"> and bank_card_number = #{bankCardNumber}</if>
<if test="openingBank != null and openingBank != ''"> and opening_bank = #{openingBank}</if>
<if test="education != null and education != ''"> and education = #{education}</if>
<if test="docs != null and docs != ''"> and docs = #{docs}</if>
<if test="address != null and address != ''"> and address = #{address}</if>
<if test="contact != null and contact != ''"> and contact = #{contact}</if>
<if test="contactPhone != null and contactPhone != ''"> and contact_phone = #{contactPhone}</if>
@ -63,6 +69,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="deptId != null">dept_id,</if>
<if test="deptName != null">dept_name,</if>
<if test="empName != null and empName != ''">emp_name,</if>
<if test="wordId != null">word_id,</if>
<if test="position != null">`position`,</if>
<if test="sex != null">sex,</if>
<if test="age != null">age,</if>
<if test="phone != null">phone,</if>
@ -70,6 +78,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="bankCardNumber != null">bank_card_number,</if>
<if test="openingBank != null">opening_bank,</if>
<if test="education != null">education,</if>
<if test="docs != null">docs,</if>
<if test="address != null">address,</if>
<if test="contact != null">contact,</if>
<if test="contactPhone != null">contact_phone,</if>
@ -84,6 +93,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="deptId != null">#{deptId},</if>
<if test="deptName != null">#{deptName},</if>
<if test="empName != null and empName != ''">#{empName},</if>
<if test="wordId != null">#{wordId},</if>
<if test="position != null">#{position},</if>
<if test="sex != null">#{sex},</if>
<if test="age != null">#{age},</if>
<if test="phone != null">#{phone},</if>
@ -91,6 +102,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="bankCardNumber != null">#{bankCardNumber},</if>
<if test="openingBank != null">#{openingBank},</if>
<if test="education != null">#{education},</if>
<if test="docs != null">#{docs},</if>
<if test="address != null">#{address},</if>
<if test="contact != null">#{contact},</if>
<if test="contactPhone != null">#{contactPhone},</if>
@ -109,6 +121,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="deptId != null">dept_id = #{deptId},</if>
<if test="deptName != null">dept_name = #{deptName},</if>
<if test="empName != null and empName != ''">emp_name = #{empName},</if>
<if test="wordId != null">word_id = #{wordId},</if>
<if test="position != null">`position` = #{position},</if>
<if test="sex != null">sex = #{sex},</if>
<if test="age != null">age = #{age},</if>
<if test="phone != null">phone = #{phone},</if>
@ -116,6 +130,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="bankCardNumber != null">bank_card_number = #{bankCardNumber},</if>
<if test="openingBank != null">opening_bank = #{openingBank},</if>
<if test="education != null">education = #{education},</if>
<if test="docs != null">docs = #{docs},</if>
<if test="address != null">address = #{address},</if>
<if test="contact != null">contact = #{contact},</if>
<if test="contactPhone != null">contact_phone = #{contactPhone},</if>

2
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
Unescape View File

@ -124,4 +124,6 @@ public interface SysUserMapper
* @return 结果
*/
public SysUser checkEmailUnique(String email);
int deleteUserByPcIds(Long[] pcIds);
}

24
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
Unescape View File

@ -474,6 +474,28 @@ public class SysUserServiceImpl implements ISysUserService
return userMapper.deleteUserByIds(userIds);
}
@Override
@Transactional
public int deleteUserByPcIds(Long[] pcIds) {
for (Long pcId : pcIds) {
SysUser param = new SysUser();
param.setPcId(pcId);
List<SysUser> sysUsers = userMapper.selectUserList(param);
List<Long> userIds = sysUsers.stream().map(SysUser::getUserId).collect(Collectors.toList());
for (Long userId : userIds)
{
checkUserAllowed(new SysUser(userId));
checkUserDataScope(userId);
}
// 删除用户与角色关联
userRoleMapper.deleteUserRole(userIds.stream().toArray(Long[]::new));
// 删除用户与岗位关联
userPostMapper.deleteUserPost(userIds.stream().toArray(Long[]::new));
}
return userMapper.deleteUserByPcIds(pcIds);
}
/**
* 导入用户数据
*
@ -547,4 +569,6 @@ public class SysUserServiceImpl implements ISysUserService
}
return successMsg.toString();
}
}

Write Preview
Loading…
Cancel
Save