【8.1.0】【role】更新角色字段更新策略

kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/entity/SysRole.java

@@ -80,7 +80,7 @@ public class SysRole extends BaseExpandFieldEntity {
     /**
      * 角色所属公司id，当角色类型为20时传此值
      */
-    @TableField("role_company_id")
+    @TableField(value = "role_company_id", updateStrategy = FieldStrategy.IGNORED, insertStrategy = FieldStrategy.IGNORED)
     @ChineseDescription("角色所属公司id，当角色类型为20时传此值")
     @SimpleFieldFormat(processClass = OrgNameFormatProcess.class)
     private Long roleCompanyId;

kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/service/impl/SysRoleServiceImpl.java

@@ -148,6 +148,12 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
         }
 
         BeanUtil.copyProperties(sysRoleRequest, sysRole);
+
+        // 如果是编辑角色，改为了基础类型，则需要将公司id清空
+        if (RoleTypeEnum.SYSTEM_ROLE.getCode().equals(sysRoleRequest.getRoleType())) {
+            sysRole.setRoleCompanyId(null);
+        }
+
         this.updateById(sysRole);
 
         BusinessLogUtil.addContent("修改后角色信息如下：\n", sysRole);