修改bug

Pu Zhibing

2025-01-16 5a5f8783058db126126df2d41e8359a84850291a

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

@@ -76,7 +76,7 @@
                .eq(Share::getObjectId, objectId)
                .eq(Share::getDelFlag, 0).or()
                .eq(Share::getAddType, 1)
                .eq(Share::getDelFlag, 0));
                .eq(Share::getDelFlag, 0).orderByDesc(Share::getCreateTime));
        return R.ok(list);
    }

@@ -86,7 +86,8 @@
    public R<List<Share>> recommandlist() {
        Long userid = tokenService.getLoginUserApplet().getUserid();
        return R.ok(shareService.list(new LambdaQueryWrapper<Share>().eq(Share::getAddType, 2)
                .eq(Share::getObjectId, userid).or().eq(Share::getAddType, 1).eq(Share::getAuditStatus, 1).eq(Share::getDelFlag, 0)));
                .eq(Share::getObjectId, userid).or().eq(Share::getAddType, 1).eq(Share::getAuditStatus, 1)
                .eq(Share::getDelFlag, 0).orderByDesc(Share::getCreateTime)));
    }


@@ -104,7 +105,6 @@
            share.setObjectId(userid);
        }
        share.setDelFlag(0);
        share.setAppletShare(1);
        share.setCreateTime(LocalDateTime.now());
        shareService.save(share);
        return R.ok();
@@ -152,11 +152,12 @@
        if(sysUser.getRoleType() == 2){
            share.setObjectId(sysUser.getObjectId().longValue());
        }
        if (sysUser.getRoleType() == 1){
            share.setAuditStatus(ShareAuditStatus.SUCCESS.getCode());
        }else{
            share.setAuditStatus(ShareAuditStatus.WAIT.getCode());
        }
//        if (sysUser.getRoleType() == 1){
//            share.setAuditStatus(ShareAuditStatus.SUCCESS.getCode());
//        }else{
//            share.setAuditStatus(ShareAuditStatus.WAIT.getCode());
//        }
        share.setAuditStatus(ShareAuditStatus.WAIT.getCode());
        share.setDelFlag(0);
        shareService.save(share);
        return R.ok();