From 26d4aacdf40f7283dc3dae2043a35162b2665864 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 13 十二月 2024 10:23:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TOrderAppealController.java | 39 +++++++++++++++++++++++++++++++++++++--
1 files changed, 37 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TOrderAppealController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TOrderAppealController.java
index fab72cd..75fedb2 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TOrderAppealController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TOrderAppealController.java
@@ -6,7 +6,9 @@
import com.ruoyi.account.api.feignClient.AppUserClient;
import com.ruoyi.account.api.model.TAppUser;
import com.ruoyi.chargingPile.api.domain.SiteMenu;
+import com.ruoyi.chargingPile.api.dto.GetSiteListDTO;
import com.ruoyi.chargingPile.api.feignClient.PartnerClient;
+import com.ruoyi.chargingPile.api.feignClient.SiteClient;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.domain.BasePojo;
@@ -17,6 +19,7 @@
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.order.api.model.*;
import com.ruoyi.order.api.query.TOrderAppealQuery;
+import com.ruoyi.order.api.vo.ChargingOrderVO;
import com.ruoyi.order.api.vo.TOrderAppealVO;
import com.ruoyi.order.dto.ManageFeedbackDto;
import com.ruoyi.order.dto.ManageOrderAppealQuery;
@@ -78,13 +81,16 @@
@Resource
private SysUserRoleClient sysUserRoleClient;
-
+ @Resource
+ private PartnerClient partnerClient;
@Autowired
public TOrderAppealController(TOrderAppealService orderAppealService, TokenService tokenService) {
this.orderAppealService = orderAppealService;
this.tokenService = tokenService;
}
+ @Resource
+ private SiteClient siteClient;
@RequiresPermissions(value = {"/appealOrder"}, logical = Logical.OR)
@@ -98,10 +104,39 @@
.in(TOrderAppeal::getOrderType, 1, 2)
.orderByDesc(TOrderAppeal::getCreateTime)
.page(Page.of(manageOrderAppealQuery.getPageCurr(), manageOrderAppealQuery.getPageSize()));
-
+ SysUser sysUser = sysUserClient.getSysUser(tokenService.getLoginUser().getUserid()).getData();
+ Integer roleType = sysUser.getRoleType();
+ List<TOrderAppeal> res = new ArrayList<>();
for (TOrderAppeal record : page.getRecords()) {
+ if (record.getOrderType()!=1){
+ res.add(record);
+ }
+ if (roleType == 2 && record.getOrderType()==1){
+ List<Integer> siteIds = new ArrayList<>();
+ if (sysUser.getUserId() != null){
+ List<GetSiteListDTO> data = siteClient.getSiteListByUserId(sysUser.getUserId()).getData();
+ for (GetSiteListDTO datum : data) {
+ siteIds.add(datum.getId());
+ }
+ }
+ if (siteIds.isEmpty()){
+ siteIds.add(-1);
+ }
+ TChargingOrder byId = chargingOrderService.getById(record.getOrderId());
+ if (byId!=null&&siteIds.contains(byId.getSiteId())){
+ res.add(record);
+ // 校验有没有这个站点的权限
+ List<Boolean> data = partnerClient.managePageListMenu(sysUser.getObjectId(), byId.getSiteId()).getData();
+ record.setAuthInfo(data.get(0));
+ record.setAuthHandle(data.get(1));
+ }
+
+ }else{
+ res.add(record);
+ }
record.setUid(record.getId().toString());
}
+
return R.ok(page);
--
Gitblit v1.7.1