From d35d14bc183e7275e79cb64537ce28dc83f271f0 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 13 五月 2024 10:53:30 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

---
 north-glass-erp/src/main/java/com/example/erp/service/userInfo/PermissionRoleService.java |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/north-glass-erp/src/main/java/com/example/erp/service/userInfo/PermissionRoleService.java b/north-glass-erp/src/main/java/com/example/erp/service/userInfo/PermissionRoleService.java
index 46b7530..e96a5c7 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/userInfo/PermissionRoleService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/userInfo/PermissionRoleService.java
@@ -41,11 +41,10 @@
                         JSONObject.toJSONString(permissionRoleJson.get("detail")),
                         PermissionBasic.class);
         Integer roleId = (Integer) permissionRoleMap.get("id");
+        permissionRoleMapper.delete(new QueryWrapper<PermissionRole>().eq("role_id", roleId));
         if(permissionBasics.isEmpty() || roleId == null ){
-            return false;
+            return true;
         }
-
-
         List<PermissionRole> permissionRoles = new ArrayList<>();
         for (PermissionBasic permissionBasic : permissionBasics) {
             PermissionRole permissionRole = new PermissionRole();
@@ -53,7 +52,7 @@
             permissionRole.setPermissionId(permissionBasic.getId());
             permissionRoles.add(permissionRole);
         }
-        permissionRoleMapper.delete(new QueryWrapper<PermissionRole>().eq("role_id", roleId));
+
         return permissionRoleMapper.saveBatch(permissionRoles);
 
 

--
Gitblit v1.8.0