From 9a36ddbc0666f118ea0e32a7aed8259331101a9e Mon Sep 17 00:00:00 2001
From: zhangyuheng <zhangyuheng@lunadeer.cn>
Date: Mon, 1 Jul 2024 21:05:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E7=BB=84=E6=88=90=E5=91=98=E6=97=B6=E5=87=BA?=
 =?UTF-8?q?=E7=8E=B0=E5=A4=9A=E4=B8=AA=E9=87=8D=E5=A4=8D=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                      | 2 +-
 src/main/java/cn/lunadeer/dominion/commands/Helper.java      | 2 +-
 .../java/cn/lunadeer/dominion/dtos/PlayerPrivilegeDTO.java   | 5 +++++
 .../dominion/tuis/dominion/manage/group/SelectMember.java    | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 48d3766..d91e4c1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>cn.lunadeer</groupId>
     <artifactId>Dominion</artifactId>
-    <version>1.34.5-beta</version>
+    <version>1.34.6-beta</version>
     <packaging>jar</packaging>
 
     <name>Dominion</name>
diff --git a/src/main/java/cn/lunadeer/dominion/commands/Helper.java b/src/main/java/cn/lunadeer/dominion/commands/Helper.java
index f077678..e291c14 100644
--- a/src/main/java/cn/lunadeer/dominion/commands/Helper.java
+++ b/src/main/java/cn/lunadeer/dominion/commands/Helper.java
@@ -55,7 +55,7 @@ public class Helper {
         if (dominion == null) return players_name;
         GroupDTO group = GroupDTO.select(dominion.getId(), groupName);
         if (group == null) return players_name;
-        List<PlayerPrivilegeDTO> privileges = PlayerPrivilegeDTO.selectByGroupId(group.getId());
+        List<PlayerPrivilegeDTO> privileges = PlayerPrivilegeDTO.selectByDomGroupId(dominion.getId(), group.getId());
         for (PlayerPrivilegeDTO privilege : privileges) {
             PlayerDTO player = PlayerDTO.select(privilege.getPlayerUUID());
             if (player == null) continue;
diff --git a/src/main/java/cn/lunadeer/dominion/dtos/PlayerPrivilegeDTO.java b/src/main/java/cn/lunadeer/dominion/dtos/PlayerPrivilegeDTO.java
index a7b223b..8d8830f 100644
--- a/src/main/java/cn/lunadeer/dominion/dtos/PlayerPrivilegeDTO.java
+++ b/src/main/java/cn/lunadeer/dominion/dtos/PlayerPrivilegeDTO.java
@@ -115,6 +115,11 @@ public class PlayerPrivilegeDTO {
         return query(sql, groupId);
     }
 
+    public static List<PlayerPrivilegeDTO> selectByDomGroupId(Integer domId, Integer groupId) {
+        String sql = "SELECT * FROM player_privilege WHERE group_id = ? AND dom_id = ?;";
+        return query(sql, groupId, domId);
+    }
+
     Field id = new Field("id", FieldType.INT);
     Field playerUUID = new Field("player_uuid", FieldType.STRING);
     Field admin = new Field("admin", FieldType.BOOLEAN);
diff --git a/src/main/java/cn/lunadeer/dominion/tuis/dominion/manage/group/SelectMember.java b/src/main/java/cn/lunadeer/dominion/tuis/dominion/manage/group/SelectMember.java
index 1ca3898..000dd75 100644
--- a/src/main/java/cn/lunadeer/dominion/tuis/dominion/manage/group/SelectMember.java
+++ b/src/main/java/cn/lunadeer/dominion/tuis/dominion/manage/group/SelectMember.java
@@ -43,7 +43,7 @@ public class SelectMember {
         Line sub = Line.create().append("选择成员添加到权限组 " + group.getName())
                 .append(Button.create("返回").setExecuteCommand("/dominion group list " + dominion.getName() + " " + backPage).build());
         view.subtitle(sub);
-        List<PlayerPrivilegeDTO> members = PlayerPrivilegeDTO.selectByGroupId(-1);
+        List<PlayerPrivilegeDTO> members = PlayerPrivilegeDTO.selectByDomGroupId(dominion.getId(), -1);
         for (PlayerPrivilegeDTO member : members) {
             PlayerDTO p = PlayerDTO.select(member.getPlayerUUID());
             if (p == null) continue;