From ec73339e08669dc5a0d4ff93e6640f51473c08cd Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期六, 11 一月 2025 18:03:50 +0800 Subject: [PATCH] 修改bug --- ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShareController.java | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShareController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShareController.java index 113022a..26ea2c3 100644 --- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShareController.java +++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShareController.java @@ -134,6 +134,7 @@ if(sysUser.getRoleType() == 2){ share.setObjectId(sysUser.getObjectId().toString()); } + share.setAuditStatus(0); share.setDelFlag(0); shareService.save(share); return R.ok(); @@ -157,13 +158,13 @@ @GetMapping("/manage/list") public R<Page<Share>> managelist(String name, Integer addType, @RequestParam Integer pageNum, Integer pageSize) { //判断当前登陆人是平台还是门店 - if (tokenService.getLoginUser().getSysUser().getRoleType()==1) { + Long userid = tokenService.getLoginUser().getUserid(); + SysUser sysUser = sysUserClient.getSysUser(userid).getData(); + if (sysUser.getRoleType()==1) { Page<Share> page = shareService.lambdaQuery().eq(Share::getAuditStatus, 1).like(name != null, Share::getName, name) .eq(Share::getAddType, 1).page(Page.of(pageNum, pageSize)); return R.ok(page); }else { - Long userid = tokenService.getLoginUser().getUserid(); - SysUser sysUser = sysUserClient.getSysUser(userid).getData(); Page<Share> page = shareService.lambdaQuery().eq(Share::getAddType,3).eq(Share::getObjectId, sysUser.getObjectId()) .like(name != null, Share::getName, name).page(Page.of(pageNum, pageSize)); return R.ok(page); @@ -229,8 +230,12 @@ } - - + @ApiOperation(value = "获取小程序分享数据", tags = {"小程序-分享"}) + @GetMapping("/auth/getAppletShare") + public R<Share> getAppletShare(){ + Share one = shareService.getOne(new LambdaQueryWrapper<Share>().eq(Share::getDelFlag, 0).eq(Share::getAppletShare, 1).eq(Share::getAuditStatus, 1).last(" limit 0, 1")); + return R.ok(one); + } } -- Gitblit v1.7.1