From 19c823c2c8df4cceee0d827fb598e7f0d9b69154 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 11 三月 2025 18:57:58 +0800
Subject: [PATCH] 修改809对接bug
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 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 074a50d..e36baa3 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
@@ -29,7 +29,6 @@
import com.ruoyi.system.service.ISysRoleService;
import com.ruoyi.system.service.ISysUserRoleService;
import com.ruoyi.system.service.ISysUserService;
-import io.seata.spring.annotation.GlobalTransactional;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.util.CollectionUtils;
@@ -37,7 +36,9 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
import java.util.stream.Collectors;
/**
@@ -85,7 +86,7 @@
.eq(SysRole::getStatus, 0);
if (sysUser.getRoleType() == 2) {
wrapper.eq(SysRole::getShopId, sysUser.getObjectId());
- }else {
+ } else {
wrapper.isNull(SysRole::getShopId);
}
List<SysRole> list = roleService.list(wrapper);
@@ -104,12 +105,12 @@
}
Long userid = tokenService.getLoginUser().getUserid();
SysUser sysUser = sysUserService.getById(userid);
- if(sysUser.getRoleType() == 2){
+ if (sysUser.getRoleType() == 2) {
wrapper.eq(SysRole::getShopId, sysUser.getObjectId());
- }else{
+ } else {
wrapper.isNull(SysRole::getShopId);
}
- wrapper.ne(SysRole::getRoleId,2);//过滤门店管理员
+ wrapper.ne(SysRole::getRoleId, 2);//过滤门店管理员
PageInfo<SysRole> page = roleService.page(pageInfo, wrapper.orderByDesc(SysRole::getCreateTime));
for (SysRole record : page.getRecords()) {
long count = sysUserRoleService.count(new LambdaQueryWrapper<SysUserRole>().eq(SysUserRole::getRoleId, record.getRoleId()));
@@ -129,7 +130,7 @@
.eq(SysRole::getRoleName, dto.getRoleName()).eq(SysRole::getDelFlag, 0);
Long userid = tokenService.getLoginUser().getUserid();
SysUser sysUser = sysUserService.getById(userid);
- if(sysUser.getRoleType() == 2){
+ if (sysUser.getRoleType() == 2) {
wrapper.eq(SysRole::getShopId, sysUser.getObjectId());
}
@@ -147,7 +148,7 @@
role.setCreateBy(SecurityUtils.getUsername());
role.setCreateTime(new Date());
- if(sysUser.getRoleType() == 2){
+ if (sysUser.getRoleType() == 2) {
role.setShopId(sysUser.getObjectId());
}
roleService.insertRole(role);
--
Gitblit v1.7.1