From 6e00a7394e691883295799dd45f509e8ac57c58d Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期二, 14 一月 2025 09:35:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShareController.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 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 7498f9c..652a15a 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
@@ -155,6 +155,9 @@
@ApiOperation(value = "广告管理-分享管理-编辑", tags = {"管理后台"})
@PostMapping("/manage/edit")
public R<Void> manageedit(@RequestBody Share share) {
+ if (share.getAuditStatus()==2){
+ share.setAuditStatus(0);
+ }
shareService.updateById(share);
return R.ok();
}
@@ -174,7 +177,7 @@
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(Share::getAddType, 1).page(Page.of(pageNum, pageSize));
+ .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())
@@ -205,8 +208,13 @@
@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).eq(Share::getDelFlag, 0).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)
+ .orderByDesc(Share::getCreateTime)
+ .page(Page.of(pageNum, pageSize));
for (Share record : page.getRecords()) {
if (record.getAddType() == 2) {
AppUser appUserById = appUserClient.getAppUserById(Long.valueOf(record.getObjectId()));
--
Gitblit v1.7.1