Merge remote-tracking branch 'origin/master'

aijinhui

2023-11-22 97e4f5c460d37ae3eb9c03396dd9dd6bb3f970cd

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

@@ -20,13 +20,12 @@
    public List<SysUser> selectUserList(SysUser user);

    /**
     * 根据条件分页查询APP用户列表
     * 获取App单兵和指挥端用户列表
     *
     * @param user APP用户信息
     * @return 用户信息集合信息
     */
    public List<SysUser> selectAppUserList(SysUser user);
    public List<SysUser> selectAppUserListNoDataScope(SysUser user);
    public List<SysUser> selectAllAppUserList(SysUser user);
    /**
     * 根据条件分页查询已分配用户角色列表
     *
@@ -235,4 +234,8 @@
     */
    public void clearUserCache(String[] userIds);

    List<SysUser> userByDeptList(List<Long> deptList);

    List<SysUser> userByDept(Long deptId);

}