From f675672004af0ff9071d21546a0eee0a0c8f3092 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期五, 29 一月 2021 08:13:30 +0800
Subject: [PATCH] 增加部分搜索

---
 src/main/java/com/nanometer/smartlab/controller/UserMngController.java |   22 ++++++++++++++++++++--
 1 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/nanometer/smartlab/controller/UserMngController.java b/src/main/java/com/nanometer/smartlab/controller/UserMngController.java
index 4b6dcb6..88d23f2 100644
--- a/src/main/java/com/nanometer/smartlab/controller/UserMngController.java
+++ b/src/main/java/com/nanometer/smartlab/controller/UserMngController.java
@@ -71,6 +71,8 @@
     private List<BaseMeta> codeList;
     private List<BaseRole> roleList;
     private List<Waster> wasterSelectList;
+    private String project;
+    private String company;
 
     public List<BaseRole> getRoleList() {
         return roleList;
@@ -488,10 +490,10 @@
                 public List<SysUser> load(int first, int pageSize, String sortField, SortOrder sortOrder, Map<String, Object> filters) {
                     List<SysUser> list = null;
                     try {
-                        int count = sysUserService.getSysUserTotalCount(arp, name,departmentName);
+                        int count = sysUserService.getSysUserTotalCount(arp, name,departmentName,project,company);
                         this.setRowCount(count);
                         if (count > 0) {
-                            list = sysUserService.getSysUserList(arp, name,departmentName, first, pageSize);
+                            list = sysUserService.getSysUserList(arp, name,departmentName,project,company, first, pageSize);
                         }
                     } catch (Exception e) {
                         logger.error(e);
@@ -617,4 +619,20 @@
     public void setDepartmentName(String departmentName) {
         this.departmentName = departmentName;
     }
+
+    public String getProject() {
+        return project;
+    }
+
+    public void setProject(String project) {
+        this.project = project;
+    }
+
+    public String getCompany() {
+        return company;
+    }
+
+    public void setCompany(String company) {
+        this.company = company;
+    }
 }

--
Gitblit v1.9.2