From 3d908e23b67de70b2ea3380d76e8321fe5e169b7 Mon Sep 17 00:00:00 2001 From: s2042968 Date: Wed, 5 Mar 2025 09:49:23 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E8=A7=92=E8=89=B2=E6=9D=83?= =?UTF-8?q?=E9=99=90=E5=85=B3=E7=B3=BB=E4=B8=BB=E9=94=AEid=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E5=AD=97=E7=AC=A6=E4=B8=B2=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../software/manage/pojo/models/RolePermission.java | 8 ++++++-- .../service/serviceimpl/RolePermissionServiceImpl.java | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/RolePermission.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/RolePermission.java index 9fe91f8..5935dfa 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/RolePermission.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/RolePermission.java @@ -1,10 +1,14 @@ package com.electromagnetic.industry.software.manage.pojo.models; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.AllArgsConstructor; import lombok.Data; +import java.util.UUID; + @Data @TableName("ed_role_permission") @AllArgsConstructor @@ -13,8 +17,8 @@ public class RolePermission { /** * 主键id */ - @TableField(value = "id") - private Long id; + @TableId(type = IdType.ASSIGN_UUID) + private String id; /** * 角色编码 diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/RolePermissionServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/RolePermissionServiceImpl.java index 4ec2c99..cc17801 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/RolePermissionServiceImpl.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/RolePermissionServiceImpl.java @@ -54,7 +54,7 @@ public class RolePermissionServiceImpl extends ServiceImpl idsToDelete = permissionsToDelete.stream() + List idsToDelete = permissionsToDelete.stream() .map(RolePermission::getId) .collect(Collectors.toList()); this.removeBatchByIds(idsToDelete);