From fd7b8fb7c89832c28a838b0449bbb8a392433ee2 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 22 四月 2025 14:33:02 +0800
Subject: [PATCH] 将华为云短信替换成阿里云短信
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java
index 2ef990c..074a50d 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java
@@ -37,10 +37,7 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -83,11 +80,13 @@
Long userid = tokenService.getLoginUser().getUserid();
SysUser sysUser = sysUserService.getById(userid);
LambdaQueryWrapper<SysRole> wrapper = new LambdaQueryWrapper<SysRole>()
- .notIn(SysRole::getRoleId, Arrays.asList(2, 77, 78, 79, 80))
+ .ne(SysRole::getRoleId, 2)
.eq(SysRole::getDelFlag, 0)
.eq(SysRole::getStatus, 0);
if (sysUser.getRoleType() == 2) {
wrapper.eq(SysRole::getShopId, sysUser.getObjectId());
+ }else {
+ wrapper.isNull(SysRole::getShopId);
}
List<SysRole> list = roleService.list(wrapper);
return AjaxResult.success(list);
@@ -127,7 +126,7 @@
SysRole role = new SysRole();
role.setRoleName(dto.getRoleName());
LambdaQueryWrapper<SysRole> wrapper = Wrappers.lambdaQuery(SysRole.class)
- .eq(SysRole::getRoleName, dto.getRoleName());
+ .eq(SysRole::getRoleName, dto.getRoleName()).eq(SysRole::getDelFlag, 0);
Long userid = tokenService.getLoginUser().getUserid();
SysUser sysUser = sysUserService.getById(userid);
if(sysUser.getRoleType() == 2){
--
Gitblit v1.7.1