From 56dfe0d4bf81262622a1919cceb2b039fd356209 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 03 九月 2024 16:52:49 +0800
Subject: [PATCH] 代码提交 bug解决
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java
index 80c7b3c..7a2091d 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java
@@ -1,13 +1,12 @@
package com.ruoyi.system.service;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.common.core.domain.R;
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 +218,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 +235,8 @@
*/
PageDTO<SupplierVO> getSupplierPage(SupplierQuery query);
+ List<SysUser> getSupplierPage1();
+
/**
* 添加/编辑供应商
*
@@ -251,8 +252,11 @@
void deleteSupplier(Long id);
PageDTO<ConservatorVO> getConservatorPage(ConservatorQuery query);
+ List<SysUser> getConservatorPage2(ConservatorQueryA query);
- void saveConservator(ConservatorDTO dto);
+ List<SysUser> getConservatorPage1(String grade);
+
+ R saveConservator(ConservatorDTO dto);
void deleteConservator( Long id);
}
--
Gitblit v1.7.1