From ff2ef0cfdaf6c2217c728d4c7cd91ea47e1f3ac9 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 11 十二月 2024 16:11:04 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShareController.java | 21 ++++++++++++++++-----
1 files changed, 16 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 eb46d75..067517f 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
@@ -143,10 +143,9 @@
@ApiOperation(value = "列表", tags = {"后台-分享管理"})
@GetMapping("/manage/list")
- public R<Void> managelist(String name,Integer addType,@RequestParam Integer PageNum,Integer pageSize){
-
- shareService.lambdaQuery().like(name!=null,Share::getName,name).eq(addType!=null,Share::getAddType,addType).page(Page.of(pageSize,pageSize));
- return R.ok();
+ public R<Page<Share>> managelist(String name,Integer addType,@RequestParam Integer PageNum,Integer pageSize){
+ Page<Share> page = shareService.lambdaQuery().eq(Share::getAuditStatus,1).like(name != null, Share::getName, name).eq(addType != null, Share::getAddType, addType).page(Page.of(pageSize, pageSize));
+ return R.ok(page);
}
@ApiOperation(value = "设为小程序分享", tags = {"后台-分享管理"})
@@ -156,14 +155,26 @@
List<Share> list = shareService.lambdaQuery().list();
if (!list.isEmpty()){
for (Share share : list) {
-
+ share.setAppletShare(0);
}
+ shareService.updateBatchById(list);
}
//设置小程序分享
+ Share byId = shareService.getById(id);
+ byId.setAppletShare(1);
+ shareService.updateById(byId);
return R.ok();
}
+ @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).page(Page.of(pageSize, pageSize));
+ return R.ok(page);
+ }
+
+
--
Gitblit v1.7.1