diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/system/SysUserExtMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/system/SysUserExtMapper.xml
index b7f21a12..1abe5683 100644
--- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/system/SysUserExtMapper.xml
+++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/system/SysUserExtMapper.xml
@@ -71,12 +71,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- delete from sys_user_ext where user_id = #{userId} and project_id=#{projectId}
+ update sys_user_ext set status=1
+
+ and user_id = #{userId}
+ and project_id = #{projectId}
+
+
update sys_user_ext set is_active=0 where user_id=#{userId} and com_id=#{comId}
+
update sys_user_ext set is_active=1 where user_id=#{userId} and com_id=#{comId} and project_id=#{projectId}
+
\ No newline at end of file
diff --git a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/ISysUserExtService.java b/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/ISysUserExtService.java
index 70ece4f7..4c65f5fd 100644
--- a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/ISysUserExtService.java
+++ b/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/ISysUserExtService.java
@@ -48,5 +48,10 @@ public interface ISysUserExtService
*/
public int deleteSysUserExtById(SysUserExt sysUserExt);
+ /**
+ * 删除系统用户扩展信息
+ */
+ public int deleteSysUserExtByUserId(Long user);
+
public void updateBySysUser(SysUser sysUser);
}
diff --git a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/impl/SysUserExtServiceImpl.java b/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/impl/SysUserExtServiceImpl.java
index c283fbcc..e5c3ee45 100644
--- a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/impl/SysUserExtServiceImpl.java
+++ b/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/impl/SysUserExtServiceImpl.java
@@ -77,6 +77,17 @@ public class SysUserExtServiceImpl implements ISysUserExtService
return sysUserExtMapper.deleteSysUserExtById(sysUserExt);
}
+ /**
+ * 删除系统用户扩展信息
+ */
+ @Override
+ public int deleteSysUserExtByUserId(Long userId)
+ {
+ SysUserExt sysUserExt = new SysUserExt();
+ sysUserExt.setUserId(userId);
+ return sysUserExtMapper.deleteSysUserExtById(sysUserExt);
+ }
+
@Override
public void updateBySysUser(SysUser sysUser) {
SysUserExt where=new SysUserExt();
diff --git a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/impl/SysUserServiceImpl.java b/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/impl/SysUserServiceImpl.java
index fcb842f8..924b15b7 100644
--- a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/impl/SysUserServiceImpl.java
+++ b/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/impl/SysUserServiceImpl.java
@@ -43,7 +43,7 @@ import java.util.stream.Collectors;
/**
* 用户 业务层处理
- *
+ *
* @author ruoyi
*/
@Service
@@ -101,7 +101,7 @@ public class SysUserServiceImpl implements ISysUserService
/**
* 根据条件分页查询用户列表
- *
+ *
* @param user 用户信息
* @return 用户信息集合信息
*/
@@ -114,7 +114,7 @@ public class SysUserServiceImpl implements ISysUserService
/**
* 根据条件分页查询已分配用户角色列表
- *
+ *
* @param user 用户信息
* @return 用户信息集合信息
*/
@@ -127,7 +127,7 @@ public class SysUserServiceImpl implements ISysUserService
/**
* 根据条件分页查询未分配用户角色列表
- *
+ *
* @param user 用户信息
* @return 用户信息集合信息
*/
@@ -140,7 +140,7 @@ public class SysUserServiceImpl implements ISysUserService
/**
* 通过用户名查询用户
- *
+ *
* @param userName 用户名
* @return 用户对象信息
*/
@@ -169,7 +169,7 @@ public class SysUserServiceImpl implements ISysUserService
/**
* 通过用户ID查询用户
- *
+ *
* @param userId 用户ID
* @return 用户对象信息
*/
@@ -204,7 +204,7 @@ public class SysUserServiceImpl implements ISysUserService
/**
* 查询用户所属角色组
- *
+ *
* @param userName 用户名
* @return 结果
*/
@@ -221,7 +221,7 @@ public class SysUserServiceImpl implements ISysUserService
/**
* 查询用户所属岗位组
- *
+ *
* @param userName 用户名
* @return 结果
*/
@@ -238,7 +238,7 @@ public class SysUserServiceImpl implements ISysUserService
/**
* 校验用户名称是否唯一
- *
+ *
* @param user 用户信息
* @return 结果
*/
@@ -295,7 +295,7 @@ public class SysUserServiceImpl implements ISysUserService
/**
* 校验用户是否允许操作
- *
+ *
* @param user 用户信息
*/
@Override
@@ -309,7 +309,7 @@ public class SysUserServiceImpl implements ISysUserService
/**
* 校验用户是否有数据权限
- *
+ *
* @param userId 用户id
*/
@Override
@@ -329,7 +329,7 @@ public class SysUserServiceImpl implements ISysUserService
/**
* 新增保存用户信息
- *
+ *
* @param user 用户信息
* @return 结果
*/
@@ -444,7 +444,7 @@ public class SysUserServiceImpl implements ISysUserService
/**
* 注册用户信息
- *
+ *
* @param user 用户信息
* @return 结果
*/
@@ -651,7 +651,7 @@ public class SysUserServiceImpl implements ISysUserService
/**
* 修改保存用户信息
- *
+ *
* @param user 用户信息
* @return 结果
*/
@@ -738,7 +738,7 @@ public class SysUserServiceImpl implements ISysUserService
/**
* 用户授权角色
- *
+ *
* @param userId 用户ID
* @param roleIds 角色组
*/
@@ -755,7 +755,7 @@ public class SysUserServiceImpl implements ISysUserService
/**
* 修改用户状态
- *
+ *
* @param user 用户信息
* @return 结果
*/
@@ -767,7 +767,7 @@ public class SysUserServiceImpl implements ISysUserService
/**
* 修改用户基本信息
- *
+ *
* @param user 用户信息
* @return 结果
*/
@@ -779,7 +779,7 @@ public class SysUserServiceImpl implements ISysUserService
/**
* 修改用户头像
- *
+ *
* @param userName 用户名
* @param avatar 头像地址
* @return 结果
@@ -792,7 +792,7 @@ public class SysUserServiceImpl implements ISysUserService
/**
* 重置用户密码
- *
+ *
* @param user 用户信息
* @return 结果
*/
@@ -804,7 +804,7 @@ public class SysUserServiceImpl implements ISysUserService
/**
* 重置用户密码
- *
+ *
* @param userName 用户名
* @param password 密码
* @return 结果
@@ -817,7 +817,7 @@ public class SysUserServiceImpl implements ISysUserService
/**
* 新增用户角色信息
- *
+ *
* @param user 用户对象
*/
public void insertUserRole(SysUser user)
@@ -827,7 +827,7 @@ public class SysUserServiceImpl implements ISysUserService
/**
* 新增用户岗位信息
- *
+ *
* @param user 用户对象
*/
public void insertUserPost(SysUser user)
@@ -855,7 +855,7 @@ public class SysUserServiceImpl implements ISysUserService
/**
* 新增用户角色信息
- *
+ *
* @param userId 用户ID
* @param roleIds 角色组
*/
@@ -878,7 +878,7 @@ public class SysUserServiceImpl implements ISysUserService
/**
* 通过用户ID删除用户
- *
+ *
* @param userId 用户ID
* @return 结果
*/
@@ -890,12 +890,14 @@ public class SysUserServiceImpl implements ISysUserService
userRoleMapper.deleteUserRoleByUserId(userId);
// 删除用户与岗位表
userPostMapper.deleteUserPostByUserId(userId);
+ // 删除用户岗位映射表
+ userExtService.deleteSysUserExtByUserId(userId);
return userMapper.deleteUserById(userId);
}
/**
* 批量删除用户信息
- *
+ *
* @param userIds 需要删除的用户ID
* @return 结果
*/
@@ -907,6 +909,8 @@ public class SysUserServiceImpl implements ISysUserService
{
checkUserAllowed(new SysUser(userId));
checkUserDataScope(userId);
+ // 删除用户岗位映射表
+ userExtService.deleteSysUserExtByUserId(userId);
}
// 删除用户与角色关联
userRoleMapper.deleteUserRole(userIds);
@@ -928,7 +932,7 @@ public class SysUserServiceImpl implements ISysUserService
/**
* 导入用户数据
- *
+ *
* @param userList 用户数据列表
* @param isUpdateSupport 是否更新支持,如果已存在,则进行更新数据
* @param operName 操作用户