From 8c4bbe846095733960c17905746bc40882a50f88 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 12 十二月 2024 16:40:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/PartnerController.java | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/PartnerController.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/PartnerController.java
index 64d447b..ece9acb 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/PartnerController.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/PartnerController.java
@@ -14,6 +14,7 @@
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.common.log.annotation.Log;
import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.common.security.annotation.Logical;
import com.ruoyi.common.security.annotation.RequiresPermissions;
import com.ruoyi.common.security.utils.SecurityUtils;
@@ -22,6 +23,7 @@
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -42,7 +44,7 @@
@Resource
private SysUserClient sysUserClient;
-
+
@@ -56,7 +58,7 @@
}
-
+
@RequiresPermissions(value = {"/partners/add"}, logical = Logical.OR)
@ResponseBody
@PostMapping("/addPartner")
@@ -79,9 +81,9 @@
Partner partner = partnerService.getPartner(id);
return AjaxResult.success(partner);
}
-
-
-
+
+
+
@ResponseBody
@GetMapping("/getPartnerR/{id}")
public R<Partner> getPartnerR(@PathVariable("id") Integer id){
@@ -124,14 +126,16 @@
return partnerService.resetPassword(resetPassword);
}
-
-
+ @Autowired
+private TokenService tokenService;
+
+
@RequiresPermissions(value = {"/site/add", "/site/update"}, logical = Logical.OR)
@ResponseBody
@GetMapping("/getPartner")
@ApiOperation(value = "获取所有合作商", tags = {"管理后台-站点管理"})
public AjaxResult<List<Partner>> getPartner(){
- SysUser sysUser = sysUserClient.getSysUser(SecurityUtils.getUserId()).getData();
+ SysUser sysUser = sysUserClient.getSysUser(tokenService.getLoginUser().getUserid()).getData();
Integer roleType = sysUser.getRoleType();
Integer objectId = sysUser.getObjectId();
LambdaQueryWrapper<Partner> wrapper = new LambdaQueryWrapper<Partner>().eq(Partner::getDelFlag, 0);
@@ -144,7 +148,7 @@
-
+
@RequiresPermissions(value = {"/site/partner_authority"}, logical = Logical.OR)
@ResponseBody
@GetMapping("/getPermissionConfiguration/{siteId}")
@@ -188,7 +192,7 @@
Set<Integer> integers = partnerService.authSite(partnerId, SiteMenu.getSiteMenu(siteMenu));
return R.ok(integers);
}
-
+
/**
* 判断合作商权限
* @param partnerId
--
Gitblit v1.7.1