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 994426f..9f2cfa0 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
@@ -292,10 +292,12 @@ public class UsersController extends BaseController {
         }*/
 
         if(null != loginContext && loginContext.getErrorcode().equals(0)) {
-            Users users1 = new Users();
-            users1.setId(users.get(0).getId());
-            users1.setLastLoginTime(new Date());
-            usersService.updateUsers(users1);
+            if (u.getLastLoginTime() != null) {
+                Users users1 = new Users();
+                users1.setId(u.getId());
+                users1.setLastLoginTime(new Date());
+                usersService.updateUsers(users1);
+            }
 
             Map<String, Object> result = new HashMap<>();
             result.put("token", loginContext.getToken());
@@ -602,7 +604,7 @@ public class UsersController extends BaseController {
             users.setYn(YnEnums.YES.getId());
             users.setModified(new Date());
             users.setCreated(new Date());
-            users.setLastLoginTime(new Date());
+//            users.setLastLoginTime(new Date());
 //            users.setPwd(LoginUtil.md5(NumberUtils.getRandomString(6)));
 
             //关联登录中心ID
@@ -741,7 +743,7 @@ public class UsersController extends BaseController {
             users.setModified(new Date());
             users.setCreated(new Date());
             users.setZhiChen(ZhiChenEnums.getById(zhiCId));
-            users.setLastLoginTime(new Date());
+//            users.setLastLoginTime(new Date());
 //            users.setPwd(LoginUtil.md5(NumberUtils.getRandomString(6)));
 
             LoginContext loginContext = new LoginContext();
@@ -1071,13 +1073,17 @@ public class UsersController extends BaseController {
      */
     @RequestMapping(value = "/passwords/reset", method = RequestMethod.PUT)
     @TokenRequired
-    public void updatePassword(HttpServletResponse response, @RequestParam(value = "userId") String id) {
+    public void updatePassword(HttpServletResponse response, @RequestParam(value = "userId") String id, @RequestParam(value = "userId", required = false) String pwd) {
         Users users = usersService.getUsers(Integer.valueOf(id));
         if (users == null) {
             ResultUtils.buildParameterErrorResultAndWrite(response, "用户ID不存在");
             return;
         }
-        users.setPwd(defaultPwd);
+        if (StringUtils.isNotBlank(pwd)) {
+            users.setPwd(MD5Utils.md5(pwd));
+        } else {
+            users.setPwd(defaultPwd);
+        }
         users.setModified(new Date());
         usersService.updateUsers(users);
         LoginContext loginContext = iSessionProvider.register(users.getLogincenterId().toString(), users.getPhone(),users.getAccount(), MD5Utils.md5(defaultPwd).toUpperCase());