From a17335c7cddc86ffe70d423e7e6e7456b1d6c93a Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期二, 10 十二月 2024 15:15:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShareController.java | 26 ++++++++++++++++++++------
1 files changed, 20 insertions(+), 6 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 59a5744..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
@@ -6,10 +6,12 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.common.security.service.TokenService;
+import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.other.api.domain.Share;
import com.ruoyi.other.enums.ShareAddType;
import com.ruoyi.other.enums.ShareAuditStatus;
import com.ruoyi.other.service.ShareService;
+import com.ruoyi.system.api.model.LoginUser;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -113,7 +115,8 @@
@ApiOperation(value = "添加", tags = {"后台-分享管理"})
@PostMapping("/manage/add")
public R<Void> manage(@RequestBody Share share){
- Long userid = tokenService.getLoginUser().getUserid();
+ LoginUser loginUser = SecurityUtils.getLoginUser();
+ Long userid = loginUser.getSysUser().getUserId();
share.setAddType(1);
share.setAuditStatus(ShareAuditStatus.SUCCESS.getCode());
share.setObjectId(userid.toString());
@@ -140,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 = {"后台-分享管理"})
@@ -153,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