bug fix

src/main/java/com/huiju/estateagents/channel/sysChannel/controller/SysUserChannelController.java

@@ -185,6 +185,10 @@ public class SysUserChannelController extends BaseController {
                 responseBean.addError("维护小程序数量不得小于0");
                 return responseBean;
             }
+            if (StringUtils.isEmpty(taChannelProxy.getUserName())){
+                taChannelProxy.setUserName(taChannelProxy.getChannelTel());
+            }
+
             QueryWrapper<TaChannelProxy> userNameQueryWrapper = new QueryWrapper<>();
             userNameQueryWrapper.eq("user_name", taChannelProxy.getUserName());
             Integer countUserName = iTaChannelProxyService.count(userNameQueryWrapper);
@@ -192,9 +196,7 @@ public class SysUserChannelController extends BaseController {
                 responseBean.addError("账户名已存在");
                 return responseBean;
             }
-            if (!StringUtils.isEmpty(taChannelProxy.getUserName()) && StringUtils.isEmpty(taChannelProxy.getUserName().trim())){
-                taChannelProxy.setUserName(null);
-            }
+
 
             QueryWrapper<TaChannelProxy> taChannelProxyQueryWrapper = new QueryWrapper<>();
             taChannelProxyQueryWrapper.eq("channel_tel", taChannelProxy.getChannelTel());
@@ -246,11 +248,12 @@ public class SysUserChannelController extends BaseController {
         }
 
         if (StringUtils.isEmpty(taChannelProxy.getUserName())){
-            taChannelProxy.setUserName(null);
+            taChannelProxy.setUserName(taChannelProxy.getChannelTel());
         }
 
         QueryWrapper<TaChannelProxy> userNameQueryWrapper = new QueryWrapper<>();
         userNameQueryWrapper.eq("user_name", taChannelProxy.getUserName());
+        userNameQueryWrapper.ne("channel_id", id);
         Integer countUserName = iTaChannelProxyService.count(userNameQueryWrapper);
         if (countUserName > 0){
             responseBean.addError("账户名已存在");