fix: 角色管理

iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/SysRoleDataImpl.java

@@ -66,7 +66,7 @@ public class SysRoleDataImpl implements ISysRoleData, IJPACommData<SysRole, Long
 
     @Override
     public List<Long> selectMenuListByRoleId(Long roleId, boolean menuCheckStrictly) {
-        List<Long> roleIds = jpaQueryFactory.select(Projections.fields(tbSysMenu.id))
+        List<Long> roleIds = jpaQueryFactory.select(tbSysMenu.id)
                 .from(tbSysMenu)
                 .innerJoin(tbSysRoleMenu).on(tbSysMenu.id.eq(tbSysRoleMenu.menuId))
                 .where(PredicateBuilder.instance()
@@ -110,7 +110,7 @@ public class SysRoleDataImpl implements ISysRoleData, IJPACommData<SysRole, Long
         final TbSysRole tbSysRoleRes = jpaQueryFactory.select(tbSysRole).from(tbSysRole)
                 .where(PredicateBuilder.instance()
                         .and(tbSysRole.roleName.eq(role.getRoleName()))
-                        .and(Objects.nonNull(role.getId()), () -> tbSysRole.id.eq(role.getId()))
+                        .and(Objects.nonNull(role.getId()), () -> tbSysRole.id.ne(role.getId()))
                         .build()).fetchOne();
         return Objects.isNull(tbSysRoleRes);
     }
@@ -120,7 +120,7 @@ public class SysRoleDataImpl implements ISysRoleData, IJPACommData<SysRole, Long
         final TbSysRole tbSysRoleRes = jpaQueryFactory.select(tbSysRole).from(tbSysRole)
                 .where(PredicateBuilder.instance()
                         .and(tbSysRole.roleKey.eq(role.getRoleKey()))
-                        .and(Objects.nonNull(role.getId()), () -> tbSysRole.id.eq(role.getId()))
+                        .and(Objects.nonNull(role.getId()), () -> tbSysRole.id.ne(role.getId()))
                         .build()).fetchOne();
         return Objects.isNull(tbSysRoleRes);
     }

iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/SysRoleMenuDataImpl.java

@@ -61,7 +61,8 @@ public class SysRoleMenuDataImpl implements ISysRoleMenuData, IJPACommData<SysRo
 
     @Override
     public long insertBatch(List<SysRoleMenu> list) {
-        return jpaQueryFactory.insert(tbSysRoleMenu).values(List.of(Objects.requireNonNull(MapstructUtils.convert(list, TbSysRoleMenu.class)))).execute();
+        List<TbSysRoleMenu> tbSysRoleMenus = Objects.requireNonNull(MapstructUtils.convert(list, TbSysRoleMenu.class));
+        return sysRoleMenuRepository.saveAll(tbSysRoleMenus).size();
     }
 
     @Override

iot-module/iot-system/src/main/java/cc/iotkit/system/dto/bo/SysRoleBo.java

@@ -29,7 +29,7 @@ public class SysRoleBo extends BaseDto {
      * 角色ID
      */
     @NotNull(message = "角色ID不能为空", groups = { EditGroup.class })
-    private Long roleId;
+    private Long id;
 
     /**
      * 角色名称
@@ -87,11 +87,11 @@ public class SysRoleBo extends BaseDto {
     private Long[] deptIds;
 
     public SysRoleBo(Long roleId) {
-        this.roleId = roleId;
+        this.id = roleId;
     }
 
     public boolean isSuperAdmin() {
-        return UserConstants.SUPER_ADMIN_ID.equals(this.roleId);
+        return UserConstants.SUPER_ADMIN_ID.equals(this.id);
     }
 
 }