From 8608d56a4605d63452fbff36420dae48dd88779d Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 21 八月 2024 17:02:17 +0800
Subject: [PATCH] 合并代码
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java | 3 +++
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppCouponController.java | 2 +-
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TCoupon.java | 4 ++--
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java | 17 ++++++++++++-----
4 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TCoupon.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TCoupon.java
index a012a52..ebe7621 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TCoupon.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TCoupon.java
@@ -106,8 +106,8 @@
private BigDecimal vipPaymentAmount;
@ApiModelProperty(value = "优惠券说明")
- @TableField("explain")
- private String explain;
+ @TableField("explains")
+ private String explains;
@ApiModelProperty(value = "说明")
@TableField("remark")
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
index dc848a4..ad0660a 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
@@ -174,6 +174,9 @@
public AjaxResult<List<String>> getRoleSiteName(@PathVariable Integer roleId){
List<Integer> ids = roleSiteClient.getSiteIds(roleId.longValue()).getData();
List<Site> data = siteClient.getSiteByIds(ids).getData();
+ if(null == data){
+ return AjaxResult.success(new ArrayList<>());
+ }
List<String> siteNames = data.stream().map(Site::getName).collect(Collectors.toList());
return AjaxResult.success(siteNames);
}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
index b424abf..4a699e1 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
@@ -14,10 +14,7 @@
import com.ruoyi.system.domain.vo.MetaVo;
import com.ruoyi.system.domain.vo.RouterVo;
import com.ruoyi.system.domain.vo.TreeSelect;
-import com.ruoyi.system.mapper.SysMenuMapper;
-import com.ruoyi.system.mapper.SysRoleMapper;
-import com.ruoyi.system.mapper.SysRoleMenuMapper;
-import com.ruoyi.system.mapper.SysUserRoleMapper;
+import com.ruoyi.system.mapper.*;
import com.ruoyi.system.service.ISysMenuService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -27,6 +24,8 @@
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.system.api.domain.SysRole;
import com.ruoyi.system.api.domain.SysUser;
+
+import javax.annotation.Resource;
/**
* 菜单 业务层处理
@@ -52,6 +51,12 @@
@Autowired
private SysUserRoleMapper sysUserRoleMapper;
+
+ @Resource
+ private SysUserMapper sysUserMapper;
+
+
+
/**
* 根据用户查询系统菜单列表
@@ -352,7 +357,9 @@
@Override
public List<SysMenus> getAllMenu() {
- Long roleId = tokenService.getLoginUser().getSysUser().getRoles().get(0).getRoleId();
+ Long userid = tokenService.getLoginUser().getUserid();
+ SysUserRole sysUserRole = sysUserRoleMapper.selectSysUserRoleByUserId(userid);
+ Long roleId = sysUserRole.getRoleId();
List<SysMenus> list=null;
if(roleId!=1){
list = menuMapper.getAllOne();
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppCouponController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppCouponController.java
index b01fb9f..d623721 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppCouponController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppCouponController.java
@@ -133,7 +133,7 @@
* @return 优惠券ids 查询每个优惠券的发放数量
*/
@PostMapping("/getCountByCouponIds")
- public R<List<Integer>> getCountByCouponIds(@RequestParam("couponIds") String couponIds) {
+ public R<List<Integer>> getCountByCouponIds( String couponIds) {
// 最终结果 和优惠券id一一对应
List<Integer> res = new ArrayList<>();
String[] split = couponIds.split(",");
--
Gitblit v1.7.1