From dd8795a2675e32b25abe98f644f80d5f72fadb90 Mon Sep 17 00:00:00 2001
From: kongzy <kongzy>
Date: 星期三, 01 十一月 2023 14:08:55 +0800
Subject: [PATCH] update icon

---
 src/main/java/com/nanometer/smartlab/service/SysUserServiceImpl.java |   41 ++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 40 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/nanometer/smartlab/service/SysUserServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/SysUserServiceImpl.java
index 021fbca..45b1b36 100644
--- a/src/main/java/com/nanometer/smartlab/service/SysUserServiceImpl.java
+++ b/src/main/java/com/nanometer/smartlab/service/SysUserServiceImpl.java
@@ -2,6 +2,7 @@
 
 import com.google.common.collect.ImmutableMap;
 import com.nanometer.smartlab.dao.SysUserDao;
+import com.nanometer.smartlab.entity.SysLaboratoryContainer;
 import com.nanometer.smartlab.entity.SysReagent;
 import com.nanometer.smartlab.entity.SysUser;
 import com.nanometer.smartlab.entity.dto.HazardousWasteUser;
@@ -13,6 +14,7 @@
 import com.nanometer.smartlab.exception.AlarmException;
 import com.nanometer.smartlab.exception.BusinessException;
 import com.nanometer.smartlab.exception.ExceptionEnumCode;
+import com.nanometer.smartlab.model.CommonPage;
 import com.nanometer.smartlab.util.ExcelUtils;
 import com.nanometer.smartlab.util.FacesUtils;
 import com.nanometer.smartlab.util.IDUtils;
@@ -63,6 +65,35 @@
             throw new BusinessException(ExceptionEnumCode.DB_ERR, MessageUtil.getMessageByCode(ExceptionEnumCode.DB_ERR.getCode()), e);
         }
     }
+
+    @Override
+    public CommonPage<SysUser> getSysUserList(Integer pageNum, Integer pageSize, String name) {
+        if(pageNum==null||pageNum<1){
+            pageNum=1;
+        }
+        if(pageSize==null||pageSize<1){
+            pageSize=10;
+        }
+        if(pageSize>50){
+            pageSize=50;
+        }
+        Map<String, Object> params = new HashMap<>();
+        if (StringUtils.isNotBlank(name)) {
+            params.put("name","%" + name+ "%");
+        }
+        params.put("first", (pageNum-1)*pageSize);
+        params.put("pageSize", pageSize);
+        CommonPage commonPage=new CommonPage();
+        commonPage.setPageNum(pageNum);
+        commonPage.setPageSize(pageSize);
+        Long total=new Long(sysUserDao.getSysUserTotalCount(params));
+        commonPage.setTotal(total);
+        commonPage.setTotalPage(CommonPage.getTotalPage(total,pageSize));
+        List<SysUser> sysReagents=sysUserDao.getSysUserSimpleInfoList(params);
+        commonPage.setList(sysReagents);
+        return commonPage;
+    }
+
     @Transactional(propagation = Propagation.REQUIRED)
     public int getSysUserTotalCount(String arp, String name,String departmentName,String project,String company) {
         try {
@@ -192,10 +223,11 @@
     }
 
     @Override
-    public List<SysUser> getHasProjectSysUserList(String department) {
+    public List<SysUser> getHasProjectSysUserList(String department, String project) {
         try {
             Map<String, Object> params = new HashMap<String, Object>();
             params.put("department", department);
+            params.put("project", project);
             params.put("approverFlag", ApproverFlag.YES);
             return this.sysUserDao.getHasProjectSysUserList(params);
         } catch (DataAccessException e) {
@@ -427,5 +459,12 @@
         return sysUserDao.getLibrarianEmail();
     }
 
+    @Override
+    public SysUser getUserByName(String approveUserName) {
+        List<SysUser> users = sysUserDao.getUserByName(approveUserName);
+        if (users.size() != 1) return  null;
+        return users.get(0);
+    }
+
 
 }

--
Gitblit v1.9.2