From 34981c30a78e8bbd7791131059a9210f9928b62c Mon Sep 17 00:00:00 2001
From: 刘光辉 <347230014@qq.com>
Date: 星期四, 17 九月 2026 09:24:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master

---
 jnpf-dms/jnpf-dms-biz/src/main/java/jnpf/dmsMapper/DmsPermissionGroupMapper.java |   46 ++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 46 insertions(+), 0 deletions(-)

diff --git a/jnpf-dms/jnpf-dms-biz/src/main/java/jnpf/dmsMapper/DmsPermissionGroupMapper.java b/jnpf-dms/jnpf-dms-biz/src/main/java/jnpf/dmsMapper/DmsPermissionGroupMapper.java
new file mode 100644
index 0000000..eab8e4a
--- /dev/null
+++ b/jnpf-dms/jnpf-dms-biz/src/main/java/jnpf/dmsMapper/DmsPermissionGroupMapper.java
@@ -0,0 +1,46 @@
+package jnpf.dmsMapper;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import jnpf.permission.entity.PermissionGroupEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+@Mapper
+public interface DmsPermissionGroupMapper extends BaseMapper<PermissionGroupEntity> {
+
+    default List<PermissionGroupEntity> selectEnabledByIds(Collection<String> ids) {
+        if (ids == null || ids.isEmpty()) {
+            return Collections.emptyList();
+        }
+        LambdaQueryWrapper<PermissionGroupEntity> query = new LambdaQueryWrapper<>();
+        query.in(PermissionGroupEntity::getId, new ArrayList<>(ids))
+                .eq(PermissionGroupEntity::getEnabledMark, 1);
+        return selectList(query);
+    }
+
+    default List<PermissionGroupEntity> selectEnabled(int limit) {
+        LambdaQueryWrapper<PermissionGroupEntity> query = new LambdaQueryWrapper<>();
+        query.eq(PermissionGroupEntity::getEnabledMark, 1)
+                .orderByAsc(PermissionGroupEntity::getId)
+                .last("LIMIT " + limit);
+        return selectList(query);
+    }
+
+    default List<PermissionGroupEntity> selectEnabled(String keyword, int limit) {
+        LambdaQueryWrapper<PermissionGroupEntity> query = new LambdaQueryWrapper<>();
+        query.eq(PermissionGroupEntity::getEnabledMark, 1);
+        if (keyword != null && !keyword.trim().isEmpty()) {
+            query.and(nested -> nested.like(PermissionGroupEntity::getFullName, keyword.trim())
+                    .or().like(PermissionGroupEntity::getEnCode, keyword.trim()));
+        }
+        query.orderByAsc(PermissionGroupEntity::getSortCode)
+                .orderByDesc(PermissionGroupEntity::getCreatorTime)
+                .last("LIMIT " + limit);
+        return selectList(query);
+    }
+}

--
Gitblit v1.8.0