diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/UserContoller.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/UserContoller.java
index 0e45547..4c3b9c8 100644
--- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/UserContoller.java
+++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/UserContoller.java
@@ -305,14 +305,21 @@ public class UserContoller {
     /**
      * PC-查询登陆账号是否存在
      * @param  login 账号
+     * @param  uid 用户标识id
      * @return true 可以使用，false已经存在
      */
     @GetMapping("getLoginUserByLogin")
-    public BaseResponse getLoginUserByLogin(String login){
+    public BaseResponse getLoginUserByLogin(String login,@RequestParam(required = false) Integer uid){
         BaseResponse baseResponse=new BaseResponse();
         try {
-            LymsUser user=lymsUserService.getOne(new QueryWrapper<LymsUser>().eq("login", login));
-            baseResponse.setObject(null==user?true:false);
+            if(null!=uid){//修改的时候判断是否重复
+                LymsUser user2=lymsUserService.getOne(new QueryWrapper<LymsUser>().eq("uid", uid));
+                LymsUser user=lymsUserService.getOne(new QueryWrapper<LymsUser>().eq("login", login));
+                baseResponse.setObject(null==user?true:(user2.getLogin().equals(login)?true:false));
+            }else {
+                LymsUser user=lymsUserService.getOne(new QueryWrapper<LymsUser>().eq("login", login));
+                baseResponse.setObject(null==user?true:false);
+            }
             baseResponse.setErrormsg("成功");
         } catch (Exception e) {
             baseResponse.setErrormsg("失败");