From 7435b78aa64bb9fdfdc8e89787a0b88ef54ac8ef Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期五, 29 一月 2021 16:20:13 +0800
Subject: [PATCH] 修改危废页面

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

diff --git a/src/main/java/com/nanometer/smartlab/controller/UserMngController.java b/src/main/java/com/nanometer/smartlab/controller/UserMngController.java
index 78f0c67..fe55ece 100644
--- a/src/main/java/com/nanometer/smartlab/controller/UserMngController.java
+++ b/src/main/java/com/nanometer/smartlab/controller/UserMngController.java
@@ -7,6 +7,7 @@
 import com.nanometer.smartlab.entity.enumtype.ApproverFlag;
 import com.nanometer.smartlab.entity.enumtype.SeeFlag;
 import com.nanometer.smartlab.entity.enumtype.ValidFlag;
+import com.nanometer.smartlab.entity.enumtype.Waster;
 import com.nanometer.smartlab.service.BaseMetaService;
 import com.nanometer.smartlab.service.BaseRoleService;
 import com.nanometer.smartlab.service.SysProjectService;
@@ -69,6 +70,7 @@
     private String editPasswor;
     private List<BaseMeta> codeList;
     private List<BaseRole> roleList;
+    private List<Waster> wasterSelectList;
 
     public List<BaseRole> getRoleList() {
         return roleList;
@@ -449,6 +451,11 @@
                 if(sysUser.getPassword()==null || sysUser.getPassword().equals("")){
                     sysUser.setPassword(this.editPasswor);
                 }else {
+                    String PW_PATTERN = "(?=.*[A-Z])(?=.*[a-z])(?=.*[0-9])(?=.*[~!@#$%^&*_.]).{8,}";
+                    if (!sysUser.getPassword().matches(PW_PATTERN)){
+                        FacesUtils.warn("密码必须8位以上,并且包含大小写字母、数字、特殊符号三种以上");
+                        return;
+                    }
                     sysUser.setPassword(MD5Utils.encode(sysUser.getPassword()));
                 }
                 this.sysUserService.updateSysUser(sysUser);
@@ -552,6 +559,14 @@
     	return seeFlagSelectList;
     }
 
+    public List<Waster> getWasterSelectList() {
+        if (this.wasterSelectList == null) {
+            this.wasterSelectList = Arrays.asList(Waster.values());
+        }
+
+        return wasterSelectList;
+    }
+
     public String getArp() {
         return arp;
     }

--
Gitblit v1.9.2