Merge branch 'huacheng_test' into haucheng_panzhihua

yanghui

2022-11-04 1a6eb2ac656de3b35c64db8b9006db2ed9248872

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSanShuoExpertServiceImpl.java

@@ -107,6 +107,10 @@
                    e.printStackTrace();
                }
                //生成后台账号
                //如果是普达社区专家则不生成后台账号
                if (nonNull(expert.getCommunityId()) && !expert.getCommunityId().equals(10172)){
                   return R.ok();
                }
                AdministratorsUserVO user=new AdministratorsUserVO();
                user.setUserId(Snowflake.getId());
                user.setAccount(comSanshuoExpertDTO.getAccount());
@@ -115,7 +119,8 @@
                user.setType(11);
                user.setImageUrl(comSanshuoExpertDTO.getAvatar());
                user.setPhone(comSanshuoExpertDTO.getPhone());
                return R.ok(userService.sanShuoAddUser(user));
                userService.sanShuoAddUser(user);
                return R.ok();
            }
        }else {
            ComSanshuoExpert expert=new ComSanshuoExpert();