From 7349ee293781f501e3d9498c76742e064e6ce4e6 Mon Sep 17 00:00:00 2001
From: xing <xingjs@qq.com>
Date: 星期二, 28 二月 2023 09:56:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/lf/server/controller/all/PermsController.java | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/lf/server/controller/all/PermsController.java b/src/main/java/com/lf/server/controller/all/PermsController.java
index ad25dec..2e4bd15 100644
--- a/src/main/java/com/lf/server/controller/all/PermsController.java
+++ b/src/main/java/com/lf/server/controller/all/PermsController.java
@@ -1,10 +1,7 @@
package com.lf.server.controller.all;
import com.lf.server.annotation.SysLog;
-import com.lf.server.entity.all.MenusAuthEntity;
-import com.lf.server.entity.all.PermsAuthEntity;
-import com.lf.server.entity.all.ResAuthEntity;
-import com.lf.server.entity.all.ResponseMsg;
+import com.lf.server.entity.all.*;
import com.lf.server.entity.sys.LayerEntity;
import com.lf.server.entity.sys.MenuEntity;
import com.lf.server.entity.sys.UserEntity;
@@ -52,7 +49,8 @@
return fail("鐢ㄦ埛鏈櫥褰�", null);
}
- List<ResAuthEntity> rs = permsService.selectRes(ue.getUid());
+ String uid = StaticData.ADMIN.equals(ue.getUid()) ? null : ue.getUid();
+ List<ResAuthEntity> rs = permsService.selectRes(uid);
return success(rs);
} catch (Exception ex) {
@@ -70,7 +68,8 @@
return fail("鐢ㄦ埛鏈櫥褰�", null);
}
- List<MenusAuthEntity> rs = permsService.selectMenus(ue.getUid());
+ String uid = StaticData.ADMIN.equals(ue.getUid()) ? null : ue.getUid();
+ List<MenusAuthEntity> rs = permsService.selectMenus(uid);
return success(rs);
} catch (Exception ex) {
@@ -88,7 +87,8 @@
return fail("鐢ㄦ埛鏈櫥褰�", null);
}
- List<String> rs = permsService.selectPerms(ue.getUid());
+ String uid = StaticData.ADMIN.equals(ue.getUid()) ? null : ue.getUid();
+ List<String> rs = permsService.selectPerms(uid);
return success(rs);
} catch (Exception ex) {
@@ -106,7 +106,8 @@
return fail("鐢ㄦ埛鏈櫥褰�", null);
}
- List<PermsAuthEntity> rs = permsService.selectPermsEntity(ue.getUid());
+ String uid = StaticData.ADMIN.equals(ue.getUid()) ? null : ue.getUid();
+ List<PermsAuthEntity> rs = permsService.selectPermsEntity(uid);
return success(rs);
} catch (Exception ex) {
@@ -158,7 +159,8 @@
return fail("鐢ㄦ埛鏈櫥褰�", null);
}
- List<MenuEntity> list = permsService.selectMenuRecursive(id, ue.getUid());
+ String uid = StaticData.ADMIN.equals(ue.getUid()) ? null : ue.getUid();
+ List<MenuEntity> list = permsService.selectMenuRecursive(id, uid);
return success(list);
} catch (Exception ex) {
--
Gitblit v1.9.3