From c8ea2d96f5b0522a09f3203ae98fe796084d2d15 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期六, 04 一月 2025 09:34:21 +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 | 17 ++++++++++++-----
1 files changed, 12 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 d2adcc3..7fa27cd 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
@@ -42,6 +42,8 @@
private AppUserClient appUserClient;
@Resource
private ShopClient shopClient;
+
+
/**
* 分享列表
@@ -148,13 +150,13 @@
@ApiOperation(value = "广告管理-分享管理-列表", tags = {"管理后台"})
@GetMapping("/manage/list")
- public R<Page<Share>> managelist(String name, Integer addType, @RequestParam Integer pageCurr, Integer pageSize) {
+ public R<Page<Share>> managelist(String name, Integer addType, @RequestParam Integer pageNum, Integer pageSize) {
//判断当前登陆人是平台还是门店
if (tokenService.getLoginUser().getSysUser().getRoleType()==1) {
- Page<Share> page = shareService.lambdaQuery().eq(Share::getAuditStatus, 1).like(name != null, Share::getName, name).eq(addType != null, Share::getAddType, addType).page(Page.of(pageCurr, 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(pageNum, pageSize));
return R.ok(page);
}else {
- Page<Share> page = shareService.lambdaQuery().eq(Share::getAddType,3).eq(Share::getObjectId, tokenService.getLoginUser().getSysUser().getObjectId()).like(name != null, Share::getName, name).eq(addType != null, Share::getAddType, addType).page(Page.of(pageCurr, pageSize));
+ Page<Share> page = shareService.lambdaQuery().eq(Share::getAddType,3).eq(Share::getObjectId, tokenService.getLoginUser().getSysUser().getObjectId()).like(name != null, Share::getName, name).eq(addType != null, Share::getAddType, addType).page(Page.of(pageNum, pageSize));
return R.ok(page);
}
}
@@ -185,8 +187,10 @@
for (Share record : page.getRecords()) {
if (record.getAddType() == 2) {
AppUser appUserById = appUserClient.getAppUserById(Long.valueOf(record.getObjectId()));
- record.setAuthName(appUserById.getName());
- record.setAuthPhone(appUserById.getPhone());
+ if (appUserById!=null) {
+ record.setAuthName(appUserById.getName());
+ record.setAuthPhone(appUserById.getPhone());
+ }
}
if (record.getAddType() == 3) {
R<Shop> shopById = shopClient.getShopById(Integer.valueOf(record.getObjectId()));
@@ -216,5 +220,8 @@
}
+
+
+
}
--
Gitblit v1.7.1