From 716d2fd26010fc6f433936e0cc1d4add040f3976 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 14 一月 2025 17:33:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShareController.java | 24 +++++++++++++++++++-----
1 files changed, 19 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 dac5755..b7ca926 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
@@ -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);
}
@@ -174,16 +177,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);
}
--
Gitblit v1.7.1