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

无关风月

2025-01-16 6ceafc5b1f3d24dfa75b6b726a44c8a88acbe678

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

@@ -73,7 +73,10 @@
    @GetMapping("/list")
    public R<List<Share>> list(@RequestParam Integer objectId) {
        List<Share> list = shareService.list(new LambdaQueryWrapper<Share>()
                .eq(Share::getObjectId, objectId).eq(Share::getDelFlag, 0).or().eq(Share::getAddType, 1).eq(Share::getDelFlag, 0));
                .eq(Share::getObjectId, objectId)
                .eq(Share::getDelFlag, 0).or()
                .eq(Share::getAddType, 1)
                .eq(Share::getDelFlag, 0));
        return R.ok(list);
    }

@@ -101,7 +104,6 @@
            share.setObjectId(userid);
        }
        share.setDelFlag(0);
        share.setAppletShare(1);
        share.setCreateTime(LocalDateTime.now());
        shareService.save(share);
        return R.ok();
@@ -146,11 +148,15 @@
        SysUser sysUser = sysUserClient.getSysUser(userid).getData();
        share.setAddType(sysUser.getRoleType() == 1 ? 1 : 3);
        share.setAppletShare(0);
        share.setAuditStatus(ShareAuditStatus.SUCCESS.getCode());
        if(sysUser.getRoleType() == 2){
            share.setObjectId(sysUser.getObjectId().longValue());
        }
        share.setAuditStatus(0);
//        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();
@@ -159,7 +165,7 @@
    @ApiOperation(value = "广告管理-分享管理-编辑", tags = {"管理后台"})
    @PostMapping("/manage/edit")
    public R<Void> manageedit(@RequestBody Share share) {
        if (share.getAuditStatus()==2){
        if (null == share.getAuditStatus() || share.getAuditStatus()==2){
            share.setAuditStatus(0);
        }
        shareService.updateById(share);
@@ -175,16 +181,27 @@

    @ApiOperation(value = "广告管理-分享管理-列表", tags = {"管理后台"})
    @GetMapping("/manage/list")
    public R<Page<Share>> managelist(String name, Integer addType, @RequestParam Integer pageNum, Integer pageSize) {
    public R<Page<Share>> managelist(String name,
                                     Integer addType,
                                     Integer auditStatus,
                                     @RequestParam Integer pageNum, Integer pageSize) {
        //判断当前登陆人是平台还是门店
        Long userid = tokenService.getLoginUser().getUserid();
        SysUser sysUser = sysUserClient.getSysUser(userid).getData();
        if (sysUser.getRoleType()==1) {
            Page<Share> page = shareService.lambdaQuery().eq(Share::getAuditStatus, 1).eq(Share::getDelFlag, 0).like(name != null, Share::getName, name)
                    .eq(addType != null , Share::getAddType, addType).page(Page.of(pageNum, pageSize));
            Page<Share> page = shareService.lambdaQuery()
                    .eq(Share::getAuditStatus, 1)
                    .eq(Share::getDelFlag, 0)
                    .like(name != null, Share::getName, name)
                    .eq(addType != null , Share::getAddType, addType)
                    .page(Page.of(pageNum, pageSize));
            return R.ok(page);
        }else {
            Page<Share> page = shareService.lambdaQuery().eq(Share::getAddType,3).eq(Share::getDelFlag, 0).eq(Share::getObjectId, sysUser.getObjectId())
            Page<Share> page = shareService.lambdaQuery()
                    .eq(auditStatus!= null, Share::getAuditStatus, auditStatus)
                    .eq(Share::getAddType,3)
                    .eq(Share::getDelFlag, 0)
                    .eq(Share::getObjectId, sysUser.getObjectId())
                    .like(name != null, Share::getName, name).page(Page.of(pageNum, pageSize));
            return R.ok(page);
        }