From 85384328c12fcc689e1f66f4deca77168859882d Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 10 一月 2025 19:12:39 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShareController.java | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 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 0aa332c..66a2b62 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
@@ -58,8 +58,9 @@
})
@GetMapping("/list")
public R<List<Share>> list(@RequestParam Integer objectId) {
- return R.ok(shareService.list(new LambdaQueryWrapper<Share>()
- .eq(Share::getObjectId, 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));
+ return R.ok(list);
}
@@ -83,7 +84,7 @@
share.setAuditStatus(ShareAuditStatus.WAIT.getCode());
} else if (share.getAddType() == 2) {
share.setAuditStatus(ShareAuditStatus.WAIT.getCode());
- share.setObjectId(userid.toString());
+ share.setObjectId(userid);
}
share.setDelFlag(0);
share.setAppletShare(1);
@@ -132,7 +133,7 @@
share.setAppletShare(0);
share.setAuditStatus(ShareAuditStatus.SUCCESS.getCode());
if(sysUser.getRoleType() == 2){
- share.setObjectId(sysUser.getObjectId().toString());
+ share.setObjectId(sysUser.getObjectId().longValue());
}
share.setDelFlag(0);
shareService.save(share);
@@ -160,11 +161,11 @@
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)
+ Page<Share> page = shareService.lambdaQuery().eq(Share::getAuditStatus, 1).eq(Share::getDelFlag, 0).like(name != null, Share::getName, name)
.eq(Share::getAddType, 1).page(Page.of(pageNum, pageSize));
return R.ok(page);
}else {
- Page<Share> page = shareService.lambdaQuery().eq(Share::getAddType,3).eq(Share::getObjectId, sysUser.getObjectId())
+ Page<Share> page = shareService.lambdaQuery().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);
}
@@ -192,7 +193,8 @@
@ApiOperation(value = "广告管理-分享管理-审核列表", tags = {"管理后台"})
@GetMapping("/manage/auth/list")
public R<Page<Share>> authmanagelist(String name, Integer addType, @RequestParam Integer pageNum, Integer pageSize) {
- Page<Share> page = shareService.lambdaQuery().ne(Share::getAuditStatus, 1).like(name != null, Share::getName, name).eq(addType != null, Share::getAddType, addType).orderByAsc(Share::getAuditStatus).page(Page.of(pageNum, pageSize));
+ Page<Share> page = shareService.lambdaQuery().ne(Share::getAuditStatus, 1).like(name != null, Share::getName, name)
+ .eq(addType != null, Share::getAddType, addType).eq(Share::getDelFlag, 0).orderByAsc(Share::getAuditStatus).page(Page.of(pageNum, pageSize));
for (Share record : page.getRecords()) {
if (record.getAddType() == 2) {
AppUser appUserById = appUserClient.getAppUserById(Long.valueOf(record.getObjectId()));
@@ -202,7 +204,7 @@
}
}
if (record.getAddType() == 3) {
- R<Shop> shopById = shopClient.getShopById(Integer.valueOf(record.getObjectId()));
+ R<Shop> shopById = shopClient.getShopById(record.getObjectId().intValue());
if (shopById.getData() != null) {
record.setAuthName(shopById.getData().getName());
}
--
Gitblit v1.7.1