1.5.8-hgw-权限-角色-账号

yifu-permission/yifu-permission-api/src/main/java/com/yifu/cloud/plus/v1/yifu/permission/entity/SysRoleMenuRes.java

@@ -20,10 +20,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
-import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import org.hibernate.validator.constraints.Length;
 
 import javax.validation.constraints.NotBlank;
@@ -36,9 +34,8 @@ import javax.validation.constraints.NotBlank;
  */
 @Data
 @TableName("sys_role_menu_res")
-@EqualsAndHashCode(callSuper = true)
 @Schema(description = "新权限-角色-菜单-关联表")
-public class SysRoleMenuRes extends BaseEntity {
+public class SysRoleMenuRes {
 
 	/**
 	 * 主键

yifu-permission/yifu-permission-api/src/main/java/com/yifu/cloud/plus/v1/yifu/permission/entity/SysUserRoleRes.java

@@ -20,10 +20,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
-import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import org.hibernate.validator.constraints.Length;
 
 import javax.validation.constraints.NotBlank;
@@ -36,9 +34,8 @@ import javax.validation.constraints.NotBlank;
  */
 @Data
 @TableName("sys_user_role_res")
-@EqualsAndHashCode(callSuper = true)
 @Schema(description = "新权限-账号-角色关联表")
-public class SysUserRoleRes extends BaseEntity {
+public class SysUserRoleRes {
 
 	/**
 	 * 主键

yifu-permission/yifu-permission-biz/src/main/java/com/yifu/cloud/plus/v1/permission/service/impl/SysRoleInfoServiceImpl.java

@@ -111,6 +111,9 @@ public class SysRoleInfoServiceImpl extends ServiceImpl<SysRoleInfoMapper, SysRo
 				return R.failed("名称已存在");
 			}
 			this.saveOrUpdate(role);
+			for (SysRoleMenuRes res : resList) {
+				res.setRoleId(role.getFdId());
+			}
 			sysRoleMenuResService.saveBatch(resList);
 			return R.ok("保存成功");
 		}