From 67f416634f95c81e618123b826e18a57ae08220d Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 22 四月 2025 17:55:30 +0800
Subject: [PATCH] 11.6
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/EvaluateController.java | 36 ++++++++++++++++++++++++++++++------
1 files changed, 30 insertions(+), 6 deletions(-)
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/EvaluateController.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/EvaluateController.java
index f674e78..5937adf 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/EvaluateController.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/EvaluateController.java
@@ -2,7 +2,9 @@
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.utils.StringUtils;
@@ -25,6 +27,7 @@
import javax.annotation.Resource;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
@@ -47,7 +50,8 @@
private TokenService tokenService;
@Resource
private UserService userService;
-
+ @Resource
+ private FranchiseeService franchiseeService;
/**
* 订单评价分页列表
*
@@ -78,6 +82,10 @@
List<User> userList;
if (StringUtils.isNotBlank(userNo)) {
userList = userService.lambdaQuery().like(User::getNickname, userNo).list();
+ if (userList.isEmpty()){
+ Page<EvaluatePageVO> page = new Page<>();
+ return R.ok(page);
+ }
} else {
userList = new ArrayList<>();
}
@@ -90,12 +98,28 @@
evaluatePageRequest.setPageNum(pageNum);
evaluatePageRequest.setPageSize(pageSize);
evaluatePageRequest.setUserIdList(userIdList);
+
+ Integer franchiseeId = loginUser.getSysUser().getFranchiseeId();
+ String[] siteIds = new String[0];
+ if (franchiseeId!=null) {
+ Franchisee byId = franchiseeService.getById(franchiseeId);
+ siteIds = byId.getSiteIds().split(",");
+ evaluatePageRequest.setSiteIds(Arrays.asList(siteIds));
+ if (loginUser.getIsFranchisee() && siteIds.length == 0) {
+ return R.ok(new Page<>());
+ }
+ }
+
+
+
R<Page<EvaluatePageVO>> r = evaluateClient.queryPageList(evaluatePageRequest);
- for (EvaluatePageVO record : r.getData().getRecords()) {
- Integer userId = record.getUserId();
- User user = userService.getById(userId);
- if (null != user) {
- record.setUserNo(user.getNickname());
+ if (!r.getData().getRecords().isEmpty()) {
+ for (EvaluatePageVO record : r.getData().getRecords()) {
+ Integer userId = record.getUserId();
+ User user = userService.getById(userId);
+ if (null != user) {
+ record.setUserNo(user.getNickname());
+ }
}
}
return r;
--
Gitblit v1.7.1