From b9e5fff02dd17e2a50d3746c9e2c21a5ad25aaf6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8D=AD=E7=90=AA=E6=9E=AB?= <hongxingyuner@yeah.net>
Date: Wed, 31 May 2023 18:32:08 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=E9=87=8D=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/cc/iotkit/data/system/ISysUserRoleData.java | 8 ++++++++
 .../iot-data-serviceImpl-rdb/.flattened-pom.xml           | 4 ++++
 .../main/java/cc/iotkit/data/service/SysMenuDataImpl.java | 5 ++---
 .../java/cc/iotkit/data/service/SysUserRoleDataImpl.java  | 7 +++++++
 4 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/iot-common/iot-common-dao/iot-data-service/src/main/java/cc/iotkit/data/system/ISysUserRoleData.java b/iot-common/iot-common-dao/iot-data-service/src/main/java/cc/iotkit/data/system/ISysUserRoleData.java
index 8f4dfceb..7aac0886 100644
--- a/iot-common/iot-common-dao/iot-data-service/src/main/java/cc/iotkit/data/system/ISysUserRoleData.java
+++ b/iot-common/iot-common-dao/iot-data-service/src/main/java/cc/iotkit/data/system/ISysUserRoleData.java
@@ -16,4 +16,12 @@ public interface ISysUserRoleData extends ICommonData<SysUserRole, Long> {
      * @return 数量
      */
     int deleteByUserId(Long userId);
+
+    /**
+     * 通过角色ID查询角色使用数量
+     *
+     * @param roleId 角色ID
+     * @return 结果
+     */
+    long countUserRoleByRoleId(Long roleId);
 }
diff --git a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/.flattened-pom.xml b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/.flattened-pom.xml
index 4f7f9194..8bd30058 100644
--- a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/.flattened-pom.xml
+++ b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/.flattened-pom.xml
@@ -46,6 +46,10 @@
       <artifactId>lombok</artifactId>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>com.github.biyanwen</groupId>
+      <artifactId>jpa-comment-spring-boot-starter</artifactId>
+    </dependency>
     <dependency>
       <groupId>cc.iotkit</groupId>
       <artifactId>iot-common-core</artifactId>
diff --git a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/SysMenuDataImpl.java b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/SysMenuDataImpl.java
index 5cf7e0f4..5c61344a 100644
--- a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/SysMenuDataImpl.java
+++ b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/SysMenuDataImpl.java
@@ -197,9 +197,8 @@ public class SysMenuDataImpl implements ISysMenuData {
 
     @Override
     public boolean hasChildByMenuId(Long menuId) {
-        TbSysMenu tbSysMenu = jpaQueryFactory.select(QTbSysMenu.tbSysMenu).from(QTbSysMenu.tbSysMenu).where(PredicateBuilder.instance()
-                .and(QTbSysMenu.tbSysMenu.parentId.eq(menuId))
-                .build()).fetchOne();
+        TbSysMenu tbSysMenu = jpaQueryFactory.select(QTbSysMenu.tbSysMenu).from(QTbSysMenu.tbSysMenu)
+                .where(QTbSysMenu.tbSysMenu.parentId.eq(menuId)).fetchOne();
         return Objects.nonNull(tbSysMenu);
     }
 
diff --git a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/SysUserRoleDataImpl.java b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/SysUserRoleDataImpl.java
index 7de1a8c6..c6dcd7aa 100644
--- a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/SysUserRoleDataImpl.java
+++ b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/SysUserRoleDataImpl.java
@@ -4,6 +4,8 @@ import cc.iotkit.data.dao.SysUserRoleRepository;
 import cc.iotkit.data.system.ISysUserRoleData;
 import org.springframework.beans.factory.annotation.Autowired;
 
+import static cc.iotkit.data.model.QTbSysUserRole.tbSysUserRole;
+
 /**
  * @Author：tfd
  * @Date：2023/5/30 16:36
@@ -16,4 +18,9 @@ public class SysUserRoleDataImpl implements ISysUserRoleData {
     public int deleteByUserId(Long userId) {
         return sysUserRoleRepository.deleteAllByUserId(userId);
     }
+
+    @Override
+    public long countUserRoleByRoleId(Long roleId) {
+        return sysUserRoleRepository.count(tbSysUserRole.roleId.eq(roleId));
+    }
 }