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 | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 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 f8154ad..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,12 +1,18 @@
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.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;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+
import java.util.ArrayList;
import java.util.List;
@@ -212,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);
@@ -229,6 +235,8 @@
*/
PageDTO<SupplierVO> getSupplierPage(SupplierQuery query);
+ List<SysUser> getSupplierPage1();
+
/**
* 添加/编辑供应商
*
@@ -242,4 +250,13 @@
* @param id 供应商id
*/
void deleteSupplier(Long id);
+
+ PageDTO<ConservatorVO> getConservatorPage(ConservatorQuery query);
+ List<SysUser> getConservatorPage2(ConservatorQueryA query);
+
+ List<SysUser> getConservatorPage1(String grade);
+
+ R saveConservator(ConservatorDTO dto);
+
+ void deleteConservator( Long id);
}
--
Gitblit v1.7.1