From 56759ca1000da107fa4dd800399b2e78890a9d00 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期四, 14 三月 2024 15:46:48 +0800
Subject: [PATCH] bug修改
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/RoleController.java | 1 -
cloud-server-management/src/main/webapp/static/modular/system/ticket/ticket.js | 21 ++++++---------------
cloud-server-management/src/main/resources/mapper/RoleMapper.xml | 4 ++--
3 files changed, 8 insertions(+), 18 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/RoleController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/RoleController.java
index 93c2c75..fd5851e 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/RoleController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/RoleController.java
@@ -117,7 +117,6 @@
.filter(role -> role.containsKey("version") && role.get("version").equals(UserExt.getUser().getId()))
.collect(Collectors.toList());
return super.warpObject(new RoleWarpper(filteredRoles));
-
}
return super.warpObject(new RoleWarpper(roles));
}
diff --git a/cloud-server-management/src/main/resources/mapper/RoleMapper.xml b/cloud-server-management/src/main/resources/mapper/RoleMapper.xml
index 36432b2..b66143f 100644
--- a/cloud-server-management/src/main/resources/mapper/RoleMapper.xml
+++ b/cloud-server-management/src/main/resources/mapper/RoleMapper.xml
@@ -26,8 +26,8 @@
<if test="objectType == 3">
and rr.objType =3 and rr.objId =#{objectId}
</if>
- <if test="objectType == 1">
- and rr.objType =1
+ <if test="objectType == 2">
+ and rr.objType =2
</if>
</select>
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/ticket/ticket.js b/cloud-server-management/src/main/webapp/static/modular/system/ticket/ticket.js
index 936a40a..93e8afe 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/ticket/ticket.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/ticket/ticket.js
@@ -164,11 +164,6 @@
*/
TPointProducts.openEditPage = function () {
if (this.check()) {
- let size = TPointProducts.seItem.size
- if(size>0){
- Feng.info("没有操作权限");
- return;
- }
var index = layer.open({
type: 2,
title:'编辑',
@@ -187,11 +182,7 @@
*/
TPointProducts.onShelf = function () {
if (this.check()){
- let size = TPointProducts.seItem.size
- if(size>0){
- Feng.info("没有操作权限");
- return;
- }
+
var selected = $('#' + this.id).bootstrapTable('getSelections');
const data1 = {
ids:[],
@@ -225,11 +216,11 @@
*/
TPointProducts.offShelf = function () {
if (this.check()){
- let size = TPointProducts.seItem.size
- if(size>0){
- Feng.info("没有操作权限");
- return;
- }
+ // let size = TPointProducts.seItem.size
+ // if(size>0){
+ // Feng.info("没有操作权限");
+ // return;
+ // }
var selected = $('#' + this.id).bootstrapTable('getSelections');
const data1 = {
ids:[],
--
Gitblit v1.7.1