From ed8c7a5effd0d423ce1118b680ecdca6fe732609 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 02 七月 2025 16:43:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.11.205:9000/r/P2022036_Service

---
 src/main/java/com/lf/server/controller/all/PermsController.java |   40 +++++++++++++++++++++-------------------
 1 files changed, 21 insertions(+), 19 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 3898e4f..ba2a378 100644
--- a/src/main/java/com/lf/server/controller/all/PermsController.java
+++ b/src/main/java/com/lf/server/controller/all/PermsController.java
@@ -1,15 +1,12 @@
 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.sys.LayerEntity;
+import com.lf.server.entity.all.*;
+import com.lf.server.entity.data.LayerEntity;
 import com.lf.server.entity.sys.MenuEntity;
 import com.lf.server.entity.sys.UserEntity;
 import com.lf.server.service.all.PermsService;
-import com.lf.server.service.sys.LayerService;
+import com.lf.server.service.data.LayerService;
 import com.lf.server.service.sys.MenuService;
 import com.lf.server.service.sys.TokenService;
 import io.swagger.annotations.Api;
@@ -52,11 +49,12 @@
                 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) {
-            return fail(ex.getMessage(), null);
+            return fail(ex, null);
         }
     }
 
@@ -70,11 +68,12 @@
                 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) {
-            return fail(ex.getMessage(), null);
+            return fail(ex, null);
         }
     }
 
@@ -88,11 +87,12 @@
                 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) {
-            return fail(ex.getMessage(), null);
+            return fail(ex, null);
         }
     }
 
@@ -106,11 +106,12 @@
                 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) {
-            return fail(ex.getMessage(), null);
+            return fail(ex, null);
         }
     }
 
@@ -123,7 +124,7 @@
 
             return success(true);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), false);
+            return fail(ex, false);
         }
     }
 
@@ -141,7 +142,7 @@
 
             return success(list);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), null);
+            return fail(ex, null);
         }
     }
 
@@ -158,11 +159,12 @@
                 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) {
-            return fail(ex.getMessage(), null);
+            return fail(ex, null);
         }
     }
 
@@ -180,7 +182,7 @@
 
             return success(list);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), null);
+            return fail(ex, null);
         }
     }
 }

--
Gitblit v1.9.3