Merge branch 'master' of http://124.70.58.209:3000/ytrd-project-management/BaseMonitor

base-common/src/main/java/com/ozs/common/core/domain/entity/SysMenu.java

@@ -6,6 +6,7 @@ import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.ozs.common.annotation.Excel;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -29,6 +30,7 @@ public class SysMenu extends BaseEntity
 
     /** 父菜单名称 */
     @Excel(name = "父菜单名称")
+    @TableField(exist = false)
     private String parentName;
 
     /** 父菜单ID */
@@ -74,6 +76,7 @@ public class SysMenu extends BaseEntity
     private String icon;
 
     /** 子菜单 */
+    @TableField(exist = false)
     private List<SysMenu> children = new ArrayList<SysMenu>();
 
     public Long getMenuId()

base-system/src/main/java/com/ozs/system/service/impl/SysRoleServiceImpl.java

@@ -29,6 +29,7 @@ import com.ozs.system.mapper.SysRoleMapper;
 import com.ozs.system.mapper.SysRoleMenuMapper;
 import com.ozs.system.mapper.SysUserRoleMapper;
 import com.ozs.system.service.ISysRoleService;
+import org.springframework.util.ObjectUtils;
 
 /**
  * 角色 业务层处理
@@ -231,7 +232,11 @@ public class SysRoleServiceImpl extends JoinServiceImpl<SysRoleMapper, SysRole>
         roleMapper.updateRole(role);
         // 删除角色与菜单关联
         roleMenuMapper.deleteRoleMenuByRoleId(role.getRoleId());
-        return insertRoleMenu(role);
+        if (!ObjectUtils.isEmpty(role.getMenuIds())) {
+            return insertRoleMenu(role);
+        } else {
+            return 1;
+        }
     }
 
     /**
@@ -370,8 +375,8 @@ public class SysRoleServiceImpl extends JoinServiceImpl<SysRoleMapper, SysRole>
     /**
      * 批量选择授权用户角色
      *
-     * @param roleId  角色ID
-     * @param Ids 需要授权的用户数据ID
+     * @param roleId 角色ID
+     * @param Ids    需要授权的用户数据ID
      * @return 结果
      */
     @Override