From 5eaa5ee48d6b55246ec47c1c75ba00f8ddc0fb8f Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期二, 02 二月 2021 17:17:30 +0800
Subject: [PATCH] 修改危废状态
---
src/main/java/com/nanometer/smartlab/controller/UserMngController.java | 32 ++++++++++++++++++++++++++++----
1 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/controller/UserMngController.java b/src/main/java/com/nanometer/smartlab/controller/UserMngController.java
index fe55ece..92407d3 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;
@@ -410,8 +412,14 @@
return;
}
- // 检查ARP号
- if (this.sysUserService.isSysUserExist(this.sysUser.getArp(), null, null, this.sysUser.getId())) {
+ // 检查ARP号 //除自己外的arp
+// if (this.sysUserService.isSysUserExist(this.sysUser.getArp(), null, null, this.sysUser.getId())) {
+// FacesUtils.warn("ARP已存在。");
+// return;
+// }
+ List<SysUser> list = sysUserService.getUserByArp(this.sysUser.getArp());
+ assert list.size() < 2;
+ if (list.size() > 0 && !list.get(0).getId().equals(this.sysUser.getId())) {
FacesUtils.warn("ARP已存在。");
return;
}
@@ -493,10 +501,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);
@@ -622,4 +630,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