From 4db8023227b3900740b8be361c436ddadb1d0585 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 14 一月 2025 08:42:06 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShareController.java | 5 ++++-
1 files changed, 4 insertions(+), 1 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..096aac0 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())
--
Gitblit v1.7.1