傅行帆 5 years ago
parent
commit
4e5a3b6eec

+ 3
- 3
src/main/java/com/huiju/estateagents/center/taUser/service/impl/TaUserServiceImpl.java View File

140
         verificationCity(taUser.getSelectCityTree(), taUser.getDefaultCityId());
140
         verificationCity(taUser.getSelectCityTree(), taUser.getDefaultCityId());
141
 
141
 
142
         QueryWrapper<TaUser> wrapper = new QueryWrapper<>();
142
         QueryWrapper<TaUser> wrapper = new QueryWrapper<>();
143
-        wrapper.eq("login_Name", taUser.getLoginName());
143
+        wrapper.eq("phone", taUser.getPhone()).or().eq("login_Name", taUser.getLoginName());
144
         List<TaUser> taUserList = this.list(wrapper);
144
         List<TaUser> taUserList = this.list(wrapper);
145
         if (null != taUserList && taUserList.size() > 0) {
145
         if (null != taUserList && taUserList.size() > 0) {
146
-            throw new Exception("登录名重复");
146
+            throw new Exception("电话号码或登录名重复");
147
         }
147
         }
148
 
148
 
149
         //判断渠道端新增小程序最大数
149
         //判断渠道端新增小程序最大数
411
             throw new Exception("同一项目下权重值不能重复");
411
             throw new Exception("同一项目下权重值不能重复");
412
         }
412
         }
413
 
413
 
414
-        List<TaUser> taUserList = taUserMapper.getUserList(taUser.getPhone(), taUser.getLoginName(), null);
414
+        List<TaUser> taUserList = taUserMapper.getUserList(taUser.getPhone(), taUser.getLoginName(), taUser.getOrgId());
415
         if (null != taUserList && taUserList.size() > 0) {
415
         if (null != taUserList && taUserList.size() > 0) {
416
             throw new Exception("电话号码或登录名重复");
416
             throw new Exception("电话号码或登录名重复");
417
         }
417
         }