diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java
index f4d3837..b978013 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java
@@ -68,7 +68,7 @@ public class UsersController extends BaseController {
     private static final String LYMS = "龙源美生";
 
     private static final String ADMIN="管理员";
-
+    private static final  String replacePwd = "[$#&/]-+";
 
 
     /**
@@ -193,7 +193,7 @@ public class UsersController extends BaseController {
             user.setDepartmentses(departmentsService.getDepartments(user.getDeptId()));
 
 //            user.setPwd(StringUtils.isEmpty(user.getPwd())?user.getPwd():user.getPwd().replaceAll(".","*"));
-            user.setPwd("******");
+            user.setPwd(replacePwd);
         }
 
         FrontEndResult frontEndResult = new FrontEndResult();
@@ -801,7 +801,7 @@ public class UsersController extends BaseController {
             if(null!=users.getOtherAccount()&&"1".equals(user.getOtherAccount()+"")){
                 return;
             }
-            if(password.matches("^\\**$")) {
+            if(StringUtils.isNotBlank(password) && password.equals(replacePwd)) {
                 password = users.getPwd();
             }
 
@@ -866,6 +866,7 @@ public class UsersController extends BaseController {
                         users.setPhone(phone);
                         users.setAccount(account);
                         users.setLogincenterId(loginContext.getId());
+                        users.setPwd(StringUtils.isNotBlank(password) ? MD5Utils.md5(password).toUpperCase() : null);
                     } else {
                         ResultUtils.buildResultAndWrite(response, ErrorCodeConstants.SYSTEM_ERROR, loginContext.getErrormsg());
                         return;
@@ -873,8 +874,7 @@ public class UsersController extends BaseController {
                 }
             }
 
-            users.setPwd(MD5Utils.md5(password).toUpperCase());
-            users.setPhone(phone);
+
             users.setName(name);
             users.setEnable(enable);
             users.setRemarks(remarks);