fix

yami-shop-service/src/main/java/com/yami/shop/service/impl/UserServiceImpl.java

@@ -186,7 +186,8 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
 
     @Override
     public void addUser2(EnterpriseUserPo po) {
-        if (userMapper.selectCount(Wrappers.<User>lambdaQuery().eq(User::getUserMobile, po.getUserMobile())) == 0) {
+        User userInfo = userMapper.selectOne(Wrappers.<User>lambdaQuery().eq(User::getUserMobile, po.getUserMobile()));
+        if (userInfo==null) {
             User user = new User();
             user.setUserName(po.getUserMobile());
             user.setNickName("企业用户");
@@ -204,7 +205,28 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
             user.setUserId(IdUtil.simpleUUID());
             save(user);
         }else {
-            throw new GlobalException("系统已存在该员工，请勿重复添加...");
+            System.out.println("已存在...");
+            if (userInfo.getChannelId()==null){
+                User user = new User();
+                user.setNickName("企业用户");
+                user.setModifyTime(new Date());
+                user.setRealName(po.getRealName());
+                user.setChannelId(po.getChannelId());
+                user.setUserId(userInfo.getUserId());
+                userMapper.updateById(user);
+            }else {
+                if (userInfo.getChannelId().equals(po.getChannelId())){
+                    throw new GlobalException("系统已存在该员工，请勿重复添加...");
+                }else {
+                    User user = new User();
+                    user.setNickName("企业用户");
+                    user.setModifyTime(new Date());
+                    user.setRealName(po.getRealName());
+                    user.setChannelId(po.getChannelId());
+                    user.setUserId(userInfo.getUserId());
+                    userMapper.updateById(user);
+                }
+            }
         }
     }