代码提交 bug解决

无关风月

2024-08-27 b5ef65d0103a71dc7af2b9be6d2ac43aca5bb726

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

@@ -2,12 +2,10 @@

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.domain.dto.ConservatorDTO;
import com.ruoyi.system.domain.dto.ConservatorQuery;
import com.ruoyi.system.domain.dto.SupplierDTO;
import com.ruoyi.system.domain.dto.SupplierQuery;
import com.ruoyi.system.domain.dto.*;
import com.ruoyi.system.domain.vo.ConservatorVO;
import com.ruoyi.system.domain.vo.SupplierVO;
import org.springframework.validation.annotation.Validated;
@@ -219,7 +217,7 @@
    public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName);

    PageInfo<SysUser> getList(PageInfo<SysUser> pageInfo, String nickname, String phonenumber,
            Integer status);
            Integer status,Long deptId);


    PageInfo<SysUser> getAllList(PageInfo<SysUser> pageInfo, List<Integer> collect);
@@ -236,6 +234,8 @@
     */
    PageDTO<SupplierVO> getSupplierPage(SupplierQuery query);

    List<SysUser> getSupplierPage1();

    /**
     * 添加/编辑供应商
     *
@@ -251,6 +251,9 @@
    void deleteSupplier(Long id);

    PageDTO<ConservatorVO> getConservatorPage(ConservatorQuery query);
    List<SysUser> getConservatorPage2(ConservatorQueryA query);

    List<SysUser> getConservatorPage1(String grade);

    void saveConservator(ConservatorDTO dto);