From f9e7abd53fa9e1699aefd6d6ffeb2e6dfb25961b Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 13 二月 2025 18:03:34 +0800
Subject: [PATCH] 权限修改
---
ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TBillController.java | 13 +++++--------
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTenantServiceImpl.java | 5 +++--
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java | 4 ++--
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUserApplet.java | 8 ++++----
4 files changed, 14 insertions(+), 16 deletions(-)
diff --git a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TBillController.java b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TBillController.java
index a16749f..c90ea72 100644
--- a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TBillController.java
+++ b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TBillController.java
@@ -55,9 +55,8 @@
@ApiOperation(value = "缴费账单查询分页列表")
@PostMapping("list")
public R<PageInfo<TBillDto>> list(@RequestBody TBillQuery query){
- if (StringUtils.isEmpty(query.getUserId())){
- throw new ServiceException("用户ID不能为空");
- }
+ String userId = tokenService.getLoginUserApplet().getUserId();
+ query.setUserId(userId);
PageInfo<TBillDto> pageInfo = tBillService.queryPage(query);
return R.ok(pageInfo);
}
@@ -65,9 +64,8 @@
@ApiOperation(value = "缴费账单查询列表")
@PostMapping("/getBillIds")
public R<List<String>> getBillIds(@RequestBody TBillQuery query){
- if (StringUtils.isEmpty(query.getUserId())){
- throw new ServiceException("用户ID不能为空");
- }
+ String userId = tokenService.getLoginUserApplet().getUserId();
+ query.setUserId(userId);
List<String> billIds = tBillService.getBillIds(query);
return R.ok(billIds);
}
@@ -124,8 +122,7 @@
@PostMapping(value = "/invoiceList")
public R<PageInfo<TBillDto>> invoiceList(@RequestBody TBillQuery query) {
-// Long userId = tokenService.getLoginUser().getUserId();
- String userId = "1881967035070177281";
+ String userId = tokenService.getLoginUserApplet().getUserId();
query.setUserId(userId);
PageInfo<TBillDto> pageInfo = tBillService.invoiceList(query);
return R.ok(pageInfo);
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUserApplet.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUserApplet.java
index 2dceb2e..186be08 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUserApplet.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUserApplet.java
@@ -23,7 +23,7 @@
/**
* 用户ID
*/
- private Long userId;
+ private String userId;
/**
* 部门ID
@@ -86,7 +86,7 @@
this.permissions = permissions;
}
- public LoginUserApplet(Long userId, Long deptId, TTenantResp user, Set<String> permissions)
+ public LoginUserApplet(String userId, Long deptId, TTenantResp user, Set<String> permissions)
{
this.userId = userId;
this.deptId = deptId;
@@ -94,12 +94,12 @@
this.permissions = permissions;
}
- public Long getUserId()
+ public String getUserId()
{
return userId;
}
- public void setUserId(Long userId)
+ public void setUserId(String userId)
{
this.userId = userId;
}
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java
index 51fb581..a7a640b 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java
@@ -72,9 +72,9 @@
*
* @return 用户信息
*/
- public LoginUser getLoginUserApplet()
+ public LoginUserApplet getLoginUserApplet()
{
- return getLoginUser(ServletUtils.getRequest());
+ return getLoginUserApplet(ServletUtils.getRequest());
}
/**
* 获取用户身份信息
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTenantServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTenantServiceImpl.java
index e927181..95a8452 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTenantServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTenantServiceImpl.java
@@ -4,6 +4,7 @@
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.constant.DictConstants;
import com.ruoyi.common.utils.DictUtils;
+import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.mapper.TTenantMapper;
import com.ruoyi.system.model.TTenant;
import com.ruoyi.system.query.TTenantQuery;
@@ -31,8 +32,8 @@
PageInfo<TenantVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
List<TenantVO> list = this.baseMapper.pageList(query,pageInfo);
for (TenantVO tenantVO : list) {
- tenantVO.setTenantAttributesName(DictUtils.getDictLabel(DictConstants.DICT_TYPE_TENANT_ATTRIBUTE,tenantVO.getTenantAttributes()));
- tenantVO.setTenantTypeName(DictUtils.getDictLabel(DictConstants.DICT_TYPE_TENANT_TYPE,tenantVO.getTenantType()));
+ tenantVO.setTenantAttributesName(StringUtils.isNotBlank(tenantVO.getTenantAttributes())?DictUtils.getDictLabel(DictConstants.DICT_TYPE_TENANT_ATTRIBUTE,tenantVO.getTenantAttributes()):"");
+ tenantVO.setTenantTypeName(StringUtils.isNotBlank(tenantVO.getTenantType())?DictUtils.getDictLabel(DictConstants.DICT_TYPE_TENANT_TYPE,tenantVO.getTenantType()):"");
}
pageInfo.setRecords(list);
return pageInfo;
--
Gitblit v1.7.1