From eb286b8d88dc5fcd0290d0d243cb7f0a2448616f Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 31 十月 2024 22:24:29 +0800
Subject: [PATCH] 8.9
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/SiteController.java | 26 +++++++++++++++++++++++++-
1 files changed, 25 insertions(+), 1 deletions(-)
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/SiteController.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/SiteController.java
index a0e10b0..df4c149 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/SiteController.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/SiteController.java
@@ -3,10 +3,15 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.admin.entity.Franchisee;
import com.ruoyi.admin.entity.Site;
+import com.ruoyi.admin.service.FranchiseeService;
import com.ruoyi.admin.service.SiteService;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.security.annotation.RequiresPermissions;
+import com.ruoyi.common.security.service.TokenService;
+import com.ruoyi.order.api.entity.OrderResultVO;
+import com.ruoyi.system.api.model.LoginUser;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -54,13 +59,32 @@
.page(Page.of(pageNum, pageSize)));
}
+ @Resource
+ private TokenService tokenService;
+ @Resource
+ private FranchiseeService franchiseeService;
/**
* 站点列表
*/
@ApiOperation(value = "站点列表", tags = {"后台-系统设置-站点管理"})
@GetMapping(value = "/list")
public R<List<Site>> list(String siteName) {
- return R.ok(siteService.lambdaQuery().orderByDesc(Site::getCreateTime).like(siteName!=null&&siteName!="", Site::getSiteName, siteName)
+
+ LoginUser loginUser = tokenService.getLoginUser();
+ Integer franchiseeId = loginUser.getSysUser().getFranchiseeId();
+ String[] siteIds = new String[0];
+
+ if (franchiseeId!=null) {
+ Franchisee byId = franchiseeService.getById(franchiseeId);
+ siteIds = byId.getSiteIds().split(",");
+ if (loginUser.getIsFranchisee() && siteIds.length == 0) {
+ return R.ok();
+ }
+ }
+
+
+
+ return R.ok(siteService.lambdaQuery().orderByDesc(Site::getCreateTime).in(siteIds.length>0, Site::getId, siteIds).like(siteName!=null&&siteName!="", Site::getSiteName, siteName)
.eq(Site::getIsDelete, 0)
.list());
}
--
Gitblit v1.7.1