Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-10-12 493aa6cef3d036702558bde1a6994dff705e12c1

Merge branch 'zigonggao_dev' into huacheng_test

 flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java

@@ -145,8 +145,11 @@

    @Override
    public int updateConfig(GuideRepairOrder order) {
        SysUser sysUser = sysUserMapper.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getUserId, order.getGuideUserId()));
        order.setGuideUserPhone(sysUser.getPhonenumber());
        if  ( order.getGuideUserId()!=null&&!order.getGuideUserId().equals(""))
        {
            SysUser sysUser = sysUserMapper.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getUserId, order.getGuideUserId()));
            order.setGuideUserPhone(sysUser.getPhonenumber());
        }
        return baseMapper.updateConfig(order);
    }