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/service/SysUserServiceImpl.java |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/nanometer/smartlab/service/SysUserServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/SysUserServiceImpl.java
index 2edb936..c9bd4d4 100644
--- a/src/main/java/com/nanometer/smartlab/service/SysUserServiceImpl.java
+++ b/src/main/java/com/nanometer/smartlab/service/SysUserServiceImpl.java
@@ -43,7 +43,7 @@
     SysUserDao sysUserDao;
 
     @Transactional(propagation = Propagation.REQUIRED)
-    public List<SysUser> getSysUserList(String arp, String name,String departmentName, Integer first, Integer pageSize) {
+    public List<SysUser> getSysUserList(String arp, String name,String departmentName,String project,String company, Integer first, Integer pageSize) {
         try {
             Map<String, Object> params = new HashMap<String, Object>();
             if (StringUtils.isNotBlank(arp)) {
@@ -55,6 +55,8 @@
             if (StringUtils.isNotBlank(departmentName)) {
                 params.put("departmentNameLike", "%" + departmentName + "%");
             }
+            params.put("project", project);
+            params.put("company", company);
             params.put("first", first);
             params.put("pageSize", pageSize);
             return this.sysUserDao.getSysUserList(params);
@@ -64,7 +66,7 @@
         }
     }
     @Transactional(propagation = Propagation.REQUIRED)
-    public int getSysUserTotalCount(String arp, String name,String departmentName) {
+    public int getSysUserTotalCount(String arp, String name,String departmentName,String project,String company) {
         try {
             Map<String, Object> params = new HashMap<String, Object>();
             if (StringUtils.isNotBlank(arp)) {
@@ -76,6 +78,8 @@
             if (StringUtils.isNotBlank(departmentName)) {
                 params.put("departmentNameLike", "%" + departmentName + "%");
             }
+            params.put("project", project);
+            params.put("company", company);
             return this.sysUserDao.getSysUserTotalCount(params);
         } catch (DataAccessException e) {
             logger.error(e.getMessage(), e);

--
Gitblit v1.9.2