合并

CODE/smart-community/operate-api/src/main/java/com/community/huiju/service/impl/ToUserServerImpl.java

@@ -208,6 +208,11 @@ public class ToUserServerImpl implements IToUserService {
         ToUser toUser = new ToUser();
 
         String loginName = object.getString("loginName");
+        Integer ID= object.getInteger("id");
+        String userName = object.getString("userName");
+        JSONArray List = object.getJSONArray("menuArray");
+        Integer[] roleIDArray = List.toArray(new Integer[]{});
+        String remark = object.getString("remark");
 
         if (!AccountValidatorUtil.isPhone(loginName)){
             response.addError("请输入正确的手机号!");
@@ -215,13 +220,8 @@ public class ToUserServerImpl implements IToUserService {
         }
         ToUser userLoginName= toUserMapper.selectByLoginName(loginName);
         // 修改手机号排除自身
-        if (null!=userLoginName && null != userLoginName.getLoginName()) {
+        if (null!=userLoginName && null != userLoginName.getLoginName() &&(ID).equals(userLoginName.getId())) {
             if (loginName.equals(userLoginName.getLoginName())){
-                Integer ID= object.getInteger("id");
-                String userName = object.getString("userName");
-                JSONArray List = object.getJSONArray("menuArray");
-                Integer[] roleIDArray = List.toArray(new Integer[]{});
-                String remark = object.getString("remark");
 
                 toUser.setUserName(userName);
                 toUser.setLoginName(loginName);

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/UserServiceImpl.java

@@ -276,9 +276,10 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         queryWrapper.lambda().eq(User::getLoginName,loginName);
         queryWrapper.lambda().eq(User::getCommunityId,communityId);
         List<User> userLoginName= userMapper.selectList(queryWrapper);
+        Integer ID= object.getInteger("id");
         for (User us:userLoginName) {
-            // 修改手机号码时排除自身
-            if (null != us.getLoginName()&&loginName.equals(us.getLoginName())){
+            // 修改手机号码时排除自身,通过比如ID排除是不是修改的本身
+            if (null != us.getLoginName()&&loginName.equals(us.getLoginName()) && (ID).equals(us.getId())){
                 break;
             }
             if (null != us.getLoginName()) {
@@ -286,7 +287,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
                 return response;
             }
         }
-        Integer ID= object.getInteger("id");
+
         String userName = object.getString("userName");
         JSONArray List = object.getJSONArray("menuArray");
         Integer[] roleIDArray = List.toArray(new Integer[]{});