From ced11a778b9bf4deee59445a41e3ede298d8c963 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: Thu, 25 Feb 2021 11:20:05 +0800
Subject: [PATCH] 人员管理的按钮权限和 可见人员权限
---
src/main/java/com/nanometer/smartlab/service/SysLaboratoryServiceImpl.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/service/SysLaboratoryServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/SysLaboratoryServiceImpl.java
index 9abf0fc..60d56e6 100644
--- a/src/main/java/com/nanometer/smartlab/service/SysLaboratoryServiceImpl.java
+++ b/src/main/java/com/nanometer/smartlab/service/SysLaboratoryServiceImpl.java
@@ -44,7 +44,7 @@
SysUserDao sysUserDao;
@Transactional(propagation = Propagation.REQUIRED)
- public List<SysLaboratory> getSysLaboratoryList(String type, String name, Integer first, Integer pageSize) {
+ public List<SysLaboratory> getSysLaboratoryList(String type, String name,String project,Integer first, Integer pageSize) {
try {
Map<String, Object> params = new HashMap<String, Object>();
if (StringUtils.isNotBlank(type)) {
@@ -53,6 +53,7 @@
if (StringUtils.isNotBlank(name)) {
params.put("name", "%" + name + "%");
}
+ params.put("project", project);
params.put("first", first);
params.put("pageSize", pageSize);
return this.sysLaboratoryDao.getSysLaboratoryList(params);
@@ -64,7 +65,7 @@
}
@Transactional(propagation = Propagation.REQUIRED)
- public int getSysLaboratoryTotalCount(String type, String name) {
+ public int getSysLaboratoryTotalCount(String type, String name,String project) {
try {
Map<String, Object> params = new HashMap<String, Object>();
if (StringUtils.isNotBlank(type)) {
@@ -73,6 +74,7 @@
if (StringUtils.isNotBlank(name)) {
params.put("name", "%" + name + "%");
}
+ params.put("project", project);
return this.sysLaboratoryDao.getSysLaboratoryTotalCount(params);
} catch (DataAccessException e) {
logger.error(e.getMessage(), e);
@@ -243,16 +245,18 @@
map.put("barCode", "地址码");
map.put("location", "地址");
map.put("department", "部门");
+ map.put("project", "课题组");
ExcelUtils.export2Excel(list,"实验室信息",map);
}
@Override
- public List<Map> exportLabList(String type, String name) {
+ public List<Map> exportLabList(String type, String name,String project) {
Map<String,String> params = new HashMap<>();
params.put("type", type);
params.put("name", name);
+ params.put("project", project);
return sysLaboratoryDao.exportLabList(params);
}
--
Gitblit v1.9.2