From 1442f149019ee0590389abd7a88a79c4d9b59034 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 27 五月 2025 18:23:34 +0800
Subject: [PATCH] bug修改
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/UserManageController.java | 53 ++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 48 insertions(+), 5 deletions(-)
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/UserManageController.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/UserManageController.java
index 041ea0f..11c3281 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/UserManageController.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/UserManageController.java
@@ -3,7 +3,9 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.admin.entity.Franchisee;
import com.ruoyi.admin.entity.User;
+import com.ruoyi.admin.service.FranchiseeService;
import com.ruoyi.admin.service.UserService;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.exception.GlobalException;
@@ -117,6 +119,8 @@
return userService.updateBatchById(list) ? R.ok() : R.fail();
}
+ @Resource
+ private FranchiseeService franchiseeService;
/**
* 用户所关联订单记录分页列表
*
@@ -145,7 +149,18 @@
if (loginUser.getCityList()!=null) {
cityList = loginUser.getCityList();
}
- R<Page<Order>> iPageR = orderClient.orderList1(userId,cityList, pageNum, pageSize);
+ 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();
+ }
+ }
+
+
+ R<Page<Order>> iPageR = orderClient.orderList1(userId,cityList, pageNum, pageSize, Arrays.asList(siteIds));
Page<Order> data = iPageR.getData();
List<Order> records = data.getRecords();
@@ -176,14 +191,23 @@
if (null == loginUser) {
return R.loginExpire("登录失效！");
}
- R<Page<Order>> iPageR = orderClient.workOrderList(workId, pageNum, pageSize);
+
+ 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(new Page<Order>());
+ }
+ }
+ R<Page<Order>> iPageR = orderClient.workOrderList(workId, pageNum, pageSize,siteIds);
Page<Order> data = iPageR.getData();
List<Order> records = data.getRecords();
for (Order record : records) {
if (record.getAddress()!=null) {
record.setReservationAddress(record.getReservationAddress() + record.getAddress());
}
-
}
return R.ok(data);
}
@@ -209,7 +233,16 @@
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
LoginUser loginUser = tokenService.getLoginUser();
List<String> cityList = loginUser.getCityList();
- return evaluateClient.evaluateList1(cityList,userId, pageNum, pageSize);
+ 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(new Page<>());
+ }
+ }
+ return evaluateClient.evaluateList1(cityList,userId, pageNum, pageSize,Arrays.asList(siteIds));
}
/**
@@ -286,7 +319,17 @@
if (loginUser.getCityList()!=null) {
cityList = loginUser.getCityList();
}
- return withdrawClient.withdrawList1(cityList,userId, pageNum, pageSize);
+ 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 withdrawClient.withdrawList1(cityList,userId, pageNum, pageSize,Arrays.asList(siteIds));
}
/**
--
Gitblit v1.7.1