Merge remote-tracking branch 'origin/master'

无关风月

2025-06-26 e6fac7e481db2795e46685446968b7b6a36eece8

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

@@ -3,6 +3,8 @@
import java.util.List;

import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.system.applet.query.DataReportQuery;
import com.ruoyi.system.applet.vo.TaskFinishListVO;
import com.ruoyi.system.query.SysUserQuery;
import com.ruoyi.system.vo.system.SysUserVO;
import org.apache.ibatis.annotations.Mapper;
@@ -171,7 +173,7 @@

    List<SysUser> selectAllList();

    List<SysUserVO> pageList(@Param("query")SysUserQuery query);
    List<SysUserVO> pageList(@Param("query")SysUserQuery query,@Param("pageInfo")PageInfo<SysUserVO> pageInfo);

    void updatePassword(@Param("id") Long id,@Param("s") String s);

@@ -179,6 +181,10 @@

    List<SysUser> selectUserByTempLateId(@Param("templateId")String templateId);

    List<SysUser> selectUserByDeptId(@Param("id")String id);

    List<TaskFinishListVO> pageListReport(@Param("query")DataReportQuery query, @Param("pageInfo")PageInfo<TaskFinishListVO> pageInfo);

    /**
     * 通过部门id查询用户
     * @param deptId