人事考勤数据分析取消del=0限制

ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java

@@ -98,6 +98,13 @@ public interface SysUserMapper extends BaseMapperPlus<SysUserMapper, SysUser, Sy
      * @param userId
      * @return
      */
+    /**
+     * 查询所有用户包括被删除的
+     *
+     * @return 用户信息集合信息
+     */
+    SysUser selectUserByIdIncludingDel(Long userId);
+
     SysUser selectUserByIdAndNotDelFlag(Long userId);
 
     /**
@@ -106,4 +113,5 @@ public interface SysUserMapper extends BaseMapperPlus<SysUserMapper, SysUser, Sy
      */
     List<SysUser> selectListAndNotDel();
 
+
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java

@@ -233,4 +233,5 @@ public interface ISysUserService {
      */
     List<SysUser> selectUserList2();
 
+    SysUser selectUserByIdIncludingDel(Long userId);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

@@ -171,6 +171,17 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
         return baseMapper.selectUserById(userId);
     }
 
+    /**
+     * 查询所有用户包括被删除的
+     *
+     * @return 用户信息集合信息
+     */
+    @Override
+    public SysUser selectUserByIdIncludingDel(Long userId) {
+        return baseMapper.selectUserByIdIncludingDel(userId);
+    }
+
+
     @Override
     public SysUser selectUserByIdAndNotDelFlag(Long userId) {
         return baseMapper.selectUserByIdAndNotDelFlag(userId);
@@ -494,6 +505,11 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
         return baseMapper.selectListAndNotDel();
     }
 
+
+
+
+
+
     @Cacheable(cacheNames = CacheNames.SYS_USER_NAME, key = "#userId")
     @Override
     public String selectUserNameById(Long userId) {

ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -169,4 +169,10 @@
     </select>
 
 
+    <select id="selectUserByIdIncludingDel" resultType="com.ruoyi.common.core.domain.entity.SysUser">
+        <include refid="selectUserVo"/>
+        where u.user_id = #{userId}
+    </select>
+
+
 </mapper>