From 07b70a81dd94f638d31108c2029b44c26f6dde69 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 15 一月 2025 09:58:42 +0800
Subject: [PATCH] 12.18
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShareController.java | 37 ++++++++++++++++++++++++++-----------
1 files changed, 26 insertions(+), 11 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 83d284d..5097827 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);
}
@@ -149,11 +152,12 @@
if(sysUser.getRoleType() == 2){
share.setObjectId(sysUser.getObjectId().longValue());
}
- if (sysUser.getRoleType() == 1){
- share.setAuditStatus(ShareAuditStatus.SUCCESS.getCode());
- }else{
- share.setAuditStatus(ShareAuditStatus.WAIT.getCode());
- }
+// if (sysUser.getRoleType() == 1){
+// share.setAuditStatus(ShareAuditStatus.SUCCESS.getCode());
+// }else{
+// share.setAuditStatus(ShareAuditStatus.WAIT.getCode());
+// }
+ share.setAuditStatus(ShareAuditStatus.WAIT.getCode());
share.setDelFlag(0);
shareService.save(share);
return R.ok();
@@ -162,7 +166,7 @@
@ApiOperation(value = "广告管理-分享管理-编辑", tags = {"管理后台"})
@PostMapping("/manage/edit")
public R<Void> manageedit(@RequestBody Share share) {
- if (share.getAuditStatus()==2){
+ if (null == share.getAuditStatus() || share.getAuditStatus()==2){
share.setAuditStatus(0);
}
shareService.updateById(share);
@@ -178,16 +182,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