Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng

Pu Zhibing

2025-01-04 c8ea2d96f5b0522a09f3203ae98fe796084d2d15

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShareController.java

@@ -42,6 +42,8 @@
    private AppUserClient appUserClient;
    @Resource
    private ShopClient shopClient;
    
    

    /**
     * 分享列表
@@ -185,8 +187,10 @@
        for (Share record : page.getRecords()) {
            if (record.getAddType() == 2) {
                AppUser appUserById = appUserClient.getAppUserById(Long.valueOf(record.getObjectId()));
                record.setAuthName(appUserById.getName());
                record.setAuthPhone(appUserById.getPhone());
                if (appUserById!=null) {
                    record.setAuthName(appUserById.getName());
                    record.setAuthPhone(appUserById.getPhone());
                }
            }
            if (record.getAddType() == 3) {
                R<Shop> shopById = shopClient.getShopById(Integer.valueOf(record.getObjectId()));
@@ -216,5 +220,8 @@
    }


    
    
    
}