魏超 5 anos atrás
pai
commit
d32cf05ebb

+ 7
- 4
src/main/java/com/huiju/estateagents/channel/sysChannel/controller/SysUserChannelController.java Ver arquivo

185
                 responseBean.addError("维护小程序数量不得小于0");
185
                 responseBean.addError("维护小程序数量不得小于0");
186
                 return responseBean;
186
                 return responseBean;
187
             }
187
             }
188
+            if (StringUtils.isEmpty(taChannelProxy.getUserName())){
189
+                taChannelProxy.setUserName(taChannelProxy.getChannelTel());
190
+            }
191
+
188
             QueryWrapper<TaChannelProxy> userNameQueryWrapper = new QueryWrapper<>();
192
             QueryWrapper<TaChannelProxy> userNameQueryWrapper = new QueryWrapper<>();
189
             userNameQueryWrapper.eq("user_name", taChannelProxy.getUserName());
193
             userNameQueryWrapper.eq("user_name", taChannelProxy.getUserName());
190
             Integer countUserName = iTaChannelProxyService.count(userNameQueryWrapper);
194
             Integer countUserName = iTaChannelProxyService.count(userNameQueryWrapper);
192
                 responseBean.addError("账户名已存在");
196
                 responseBean.addError("账户名已存在");
193
                 return responseBean;
197
                 return responseBean;
194
             }
198
             }
195
-            if (!StringUtils.isEmpty(taChannelProxy.getUserName()) && StringUtils.isEmpty(taChannelProxy.getUserName().trim())){
196
-                taChannelProxy.setUserName(null);
197
-            }
199
+
198
 
200
 
199
             QueryWrapper<TaChannelProxy> taChannelProxyQueryWrapper = new QueryWrapper<>();
201
             QueryWrapper<TaChannelProxy> taChannelProxyQueryWrapper = new QueryWrapper<>();
200
             taChannelProxyQueryWrapper.eq("channel_tel", taChannelProxy.getChannelTel());
202
             taChannelProxyQueryWrapper.eq("channel_tel", taChannelProxy.getChannelTel());
246
         }
248
         }
247
 
249
 
248
         if (StringUtils.isEmpty(taChannelProxy.getUserName())){
250
         if (StringUtils.isEmpty(taChannelProxy.getUserName())){
249
-            taChannelProxy.setUserName(null);
251
+            taChannelProxy.setUserName(taChannelProxy.getChannelTel());
250
         }
252
         }
251
 
253
 
252
         QueryWrapper<TaChannelProxy> userNameQueryWrapper = new QueryWrapper<>();
254
         QueryWrapper<TaChannelProxy> userNameQueryWrapper = new QueryWrapper<>();
253
         userNameQueryWrapper.eq("user_name", taChannelProxy.getUserName());
255
         userNameQueryWrapper.eq("user_name", taChannelProxy.getUserName());
256
+        userNameQueryWrapper.ne("channel_id", id);
254
         Integer countUserName = iTaChannelProxyService.count(userNameQueryWrapper);
257
         Integer countUserName = iTaChannelProxyService.count(userNameQueryWrapper);
255
         if (countUserName > 0){
258
         if (countUserName > 0){
256
             responseBean.addError("账户名已存在");
259
             responseBean.addError("账户名已存在");