bug

src/main/java/com/huiju/estateagents/center/taUser/service/impl/TaUserServiceImpl.java

@@ -140,10 +140,10 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
         verificationCity(taUser.getSelectCityTree(), taUser.getDefaultCityId());
 
         QueryWrapper<TaUser> wrapper = new QueryWrapper<>();
-        wrapper.eq("login_Name", taUser.getLoginName());
+        wrapper.eq("phone", taUser.getPhone()).or().eq("login_Name", taUser.getLoginName());
         List<TaUser> taUserList = this.list(wrapper);
         if (null != taUserList && taUserList.size() > 0) {
-            throw new Exception("登录名重复");
+            throw new Exception("电话号码或登录名重复");
         }
 
         //判断渠道端新增小程序最大数
@@ -411,7 +411,7 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
             throw new Exception("同一项目下权重值不能重复");
         }
 
-        List<TaUser> taUserList = taUserMapper.getUserList(taUser.getPhone(), taUser.getLoginName(), null);
+        List<TaUser> taUserList = taUserMapper.getUserList(taUser.getPhone(), taUser.getLoginName(), taUser.getOrgId());
         if (null != taUserList && taUserList.size() > 0) {
             throw new Exception("电话号码或登录名重复");
         }