Merge remote-tracking branch 'origin/master'

aijinhui

2024-02-23 0abccf5e570dce53a802bca4ce25118dd900692c

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

@@ -26,7 +26,7 @@
     * @param sysUser APP用户信息
     * @return 用户信息集合信息
     */
    public List<SysUser> selectAppUserList(SysUser sysUser);
    public List<SysUser> selectAllAppUserList(SysUser sysUser);
    /**
     * 根据条件分页查询已配用户角色列表
     * 
@@ -132,4 +132,20 @@
     * @return 结果
     */
    public SysUser checkEmailUnique(String email);

    /**
     * 根据车辆主键查询直属及上级用户
     *
     */
    public List<SysUser> getSysUserByCarId(String carId);

    List<SysUser> userByPlanId(String id);

    List<SysUser> getOnlineCommander(String usersId);

    List<SysUser> getOnlinePC(@Param("usersId") String usersId,@Param("onLinePCIdList")List<String> onLinePCIdList);

    List<SysUser> getOwnAndChildrenOnlineSoilderList(@Param("deptIdList")List<Long> deptIdList);

    List<SysUser> getOwnAndChildrenSoilderListAll(@Param("deptIdList")List<Long> deptIdList);
}