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/sys/RoleResController.java |   48 ++++++++++++++++++------------------------------
 1 files changed, 18 insertions(+), 30 deletions(-)

diff --git a/src/main/java/com/lf/server/controller/sys/RoleResController.java b/src/main/java/com/lf/server/controller/sys/RoleResController.java
index 2371076..1e61bb9 100644
--- a/src/main/java/com/lf/server/controller/sys/RoleResController.java
+++ b/src/main/java/com/lf/server/controller/sys/RoleResController.java
@@ -1,6 +1,6 @@
 package com.lf.server.controller.sys;
 
-import com.lf.server.aspect.SysLog;
+import com.lf.server.annotation.SysLog;
 import com.lf.server.controller.all.BaseController;
 import com.lf.server.entity.all.ResponseMsg;
 import com.lf.server.entity.sys.RoleResEntity;
@@ -47,7 +47,7 @@
 
             return success(count);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), -1);
+            return fail(ex, -1);
         }
     }
 
@@ -69,7 +69,7 @@
 
             return success(rs);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), null);
+            return fail(ex, null);
         }
     }
 
@@ -94,7 +94,7 @@
 
             return success(count, rs);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), null);
+            return fail(ex, null);
         }
     }
 
@@ -107,7 +107,7 @@
 
             return success(list);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), null);
+            return fail(ex, null);
         }
     }
 
@@ -123,7 +123,7 @@
 
             return success(entity);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), null);
+            return fail(ex, null);
         }
     }
 
@@ -140,14 +140,12 @@
                 entity.setCreateUser(ue.getId());
             }
 
+            permsService.clearPermsCache();
             int count = roleResService.insert(entity);
-            if (count > 0) {
-                permsService.clearResCache();
-            }
 
             return success(count);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), -1);
+            return fail(ex, -1);
         }
     }
 
@@ -166,14 +164,12 @@
                 }
             }
 
+            permsService.clearPermsCache();
             int count = roleResService.inserts(list);
-            if (count > 0) {
-                permsService.clearResCache();
-            }
 
             return success(count);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), -1);
+            return fail(ex, -1);
         }
     }
 
@@ -185,14 +181,12 @@
     @GetMapping(value = "/delete")
     public ResponseMsg<Integer> delete(int id) {
         try {
+            permsService.clearPermsCache();
             int count = roleResService.delete(id);
-            if (count > 0) {
-                permsService.clearResCache();
-            }
 
             return success(count);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), -1);
+            return fail(ex, -1);
         }
     }
 
@@ -208,14 +202,12 @@
                 return fail("id鏁扮粍涓嶈兘涓虹┖", -1);
             }
 
+            permsService.clearPermsCache();
             int count = roleResService.deletes(ids);
-            if (count > 0) {
-                permsService.clearResCache();
-            }
 
             return success(count);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), -1);
+            return fail(ex, -1);
         }
     }
 
@@ -233,14 +225,12 @@
                 entity.setUpdateUser(ue.getId());
             }
 
+            permsService.clearPermsCache();
             int count = roleResService.update(entity);
-            if (count > 0) {
-                permsService.clearResCache();
-            }
 
             return success(count);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), -1);
+            return fail(ex, -1);
         }
     }
 
@@ -260,14 +250,12 @@
                 }
             }
 
+            permsService.clearPermsCache();
             int count = roleResService.updates(list);
-            if (count > 0) {
-                permsService.clearResCache();
-            }
 
             return success(count);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), -1);
+            return fail(ex, -1);
         }
     }
 }

--
Gitblit v1.9.3