提交代码

yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/system/SysUserExtMapper.xml

@@ -71,12 +71,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <delete id="deleteSysUserExtById" parameterType="SysUserExt">
-        delete from sys_user_ext where user_id = #{userId}  and project_id=#{projectId}
+        update sys_user_ext set status=1
+        <where>
+            <if test="userId != null">and user_id = #{userId}</if>
+            <if test="projectId != null">and project_id = #{projectId}</if>
+        </where>
     </delete>
+
     <update id="clearAllActive"  parameterType="SysUserExt">
         update sys_user_ext set is_active=0 where user_id=#{userId} and com_id=#{comId}
     </update>
+
     <update id="setActive"  parameterType="SysUserExt">
         update sys_user_ext set is_active=1 where user_id=#{userId} and com_id=#{comId} and project_id=#{projectId}
     </update>
+
 </mapper>

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);
 }

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();

yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/impl/SysUserServiceImpl.java

@@ -890,6 +890,8 @@ public class SysUserServiceImpl implements ISysUserService
         userRoleMapper.deleteUserRoleByUserId(userId);
         // 删除用户与岗位表
         userPostMapper.deleteUserPostByUserId(userId);
+        // 删除用户岗位映射表
+        userExtService.deleteSysUserExtByUserId(userId);
         return userMapper.deleteUserById(userId);
     }
 
@@ -907,6 +909,8 @@ public class SysUserServiceImpl implements ISysUserService
         {
             checkUserAllowed(new SysUser(userId));
             checkUserDataScope(userId);
+            // 删除用户岗位映射表
+            userExtService.deleteSysUserExtByUserId(userId);
         }
         // 删除用户与角色关联
         userRoleMapper.deleteUserRole(userIds);