From 78cb8dafeb68840944ca122e3c672391cea2c45f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=BE=E6=96=87=E8=B1=AA?= <980287353@qq.com>
Date: Wed, 26 Jun 2024 09:03:36 +0800
Subject: [PATCH] =?UTF-8?q?perf=EF=BC=9A=E8=B0=83=E6=95=B4=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E8=87=AA=E5=B7=B1=E7=9A=84=E5=8A=9F=E8=83=BD=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../role/controller/RoleController.java       | 21 ++++++++++++++++---
 .../role/pojos/dto/OwnerPointDTO.java         | 11 +++++-----
 2 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/springboot-role/src/main/java/com/tiesheng/role/controller/RoleController.java b/springboot-role/src/main/java/com/tiesheng/role/controller/RoleController.java
index cfb692a..7a86a67 100644
--- a/springboot-role/src/main/java/com/tiesheng/role/controller/RoleController.java
+++ b/springboot-role/src/main/java/com/tiesheng/role/controller/RoleController.java
@@ -4,7 +4,10 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.tiesheng.role.pojos.dao.*;
-import com.tiesheng.role.pojos.dto.*;
+import com.tiesheng.role.pojos.dto.GroupRxUpdateDTO;
+import com.tiesheng.role.pojos.dto.MenuListDTO;
+import com.tiesheng.role.pojos.dto.OwnerMenuDTO;
+import com.tiesheng.role.pojos.dto.OwnerPointDTO;
 import com.tiesheng.role.pojos.vo.GroupTypeDTO;
 import com.tiesheng.role.pojos.vo.RoleUserPageVO;
 import com.tiesheng.role.pojos.vo.ServiceMenuVO;
@@ -284,13 +287,25 @@ public class RoleController {
         TokenBean tokenBean = TsTokenConfig.get();
         List<CoreRoleAuthority> allOwnerMenus = coreRoleService.getOwnerAuthorityLeafList(tokenBean.getId(), tokenBean.getRoleId());
 
+        String parentId;
+        if (StrUtil.isNotEmpty(dto.getParentNo())) {
+            CoreRoleAuthority selected = coreRoleService.getAuthorityMapper().selectOne(new QueryWrapper<CoreRoleAuthority>()
+                    .eq("no", dto.getParentNo())
+                    .eq("is_deleted", 0)
+                    .last("limit 1")
+            );
+            parentId = selected == null ? "" : selected.getId();
+        } else {
+            parentId = "";
+        }
+
         List<CoreRoleAuthority> collect = allOwnerMenus.stream()
                 .filter(it -> Objects.equals(it.getType(), "point"))
                 .filter(it -> it.getService().equals(dto.getService()))
                 .filter(it -> it.getPlatform().equals(dto.getPlatform()))
                 .filter(it -> {
-                    if (StrUtil.isNotEmpty(dto.getParent())) {
-                        return dto.getParent().equals(it.getParent());
+                    if (StrUtil.isNotEmpty(parentId)) {
+                        return parentId.equals(it.getParent());
                     }
                     return true;
                 }).collect(Collectors.toList());
diff --git a/springboot-role/src/main/java/com/tiesheng/role/pojos/dto/OwnerPointDTO.java b/springboot-role/src/main/java/com/tiesheng/role/pojos/dto/OwnerPointDTO.java
index bbead6a..18b3660 100644
--- a/springboot-role/src/main/java/com/tiesheng/role/pojos/dto/OwnerPointDTO.java
+++ b/springboot-role/src/main/java/com/tiesheng/role/pojos/dto/OwnerPointDTO.java
@@ -2,18 +2,17 @@ package com.tiesheng.role.pojos.dto;
 
 public class OwnerPointDTO extends OwnerMenuDTO {
 
-    private String parent;
+    private String parentNo;
 
     ///////////////////////////////////////////////////////////////////////////
     // setter\getter
     ///////////////////////////////////////////////////////////////////////////
 
-    public String getParent() {
-        return parent;
+    public String getParentNo() {
+        return parentNo;
     }
 
-    public void setParent(String parent) {
-        this.parent = parent;
+    public void setParentNo(String parentNo) {
+        this.parentNo = parentNo;
     }
-
 }