合并代码

Pu Zhibing

2024-10-17 cd9ca6ed19f87141b28f1a62c91cc1533482f7b9

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

@@ -6,6 +6,8 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.api.query.ChangeUserQuery;
import com.ruoyi.system.query.GetSysUserList;

/**
 * 用户 业务层
@@ -208,7 +210,7 @@
     */
    public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName);

    PageInfo<SysUser> getList(PageInfo<SysUser> pageInfo, String phonenumber);
    PageInfo<SysUser> getList(PageInfo<SysUser> pageInfo, GetSysUserList getSysUserList);


    PageInfo<SysUser> getAllList(PageInfo<SysUser> pageInfo, List<Integer> collect);
@@ -217,4 +219,10 @@

    void deleteSysUser(ArrayList<Integer> userIds);

    /**
     * 获取用户选择列表
     * @param query
     * @return
     */
    PageInfo<SysUser> getChangeUserList(ChangeUserQuery query);
}