fix

zhongzheng-admin-business/src/main/java/com/zhongzheng/controller/system/BsSysMenuController.java

@@ -119,6 +119,7 @@ public class BsSysMenuController extends BaseController
             return AjaxResult.error("新增菜单'" + menu.getMenuName() + "'失败，地址必须以http(s)://开头");
         }
         menu.setCreateBy(bsTokenService.getLoginUser(ServletUtils.getRequest()).getUsername());
+        menu.setCompanyId(bsTokenService.getLoginUser(ServletUtils.getRequest()).getUser().getCompanyId());
         menu.setCreateTime(DateUtils.getNowTime());
         menu.setUpdateTime(DateUtils.getNowTime());
         return toAjax(menuService.insertMenu(menu));

zhongzheng-admin-business/src/main/java/com/zhongzheng/controller/system/BsSysRoleController.java

@@ -98,6 +98,7 @@ public class BsSysRoleController extends BaseController {
             return AjaxResult.error("新增角色'" + role.getRoleName() + "'失败，角色权限已存在");
         }
         role.setCreateBy(bsTokenService.getLoginUser(ServletUtils.getRequest()).getUsername());
+        role.setCompanyId(bsTokenService.getLoginUser(ServletUtils.getRequest()).getUser().getCompanyId());
         role.setCreateTime(DateUtils.getNowTime());
         role.setUpdateTime(DateUtils.getNowTime());
         return toAjax(roleService.insertRole(role));

zhongzheng-system/src/main/java/com/zhongzheng/modules/bs/system/domain/BsSysMenu.java

@@ -76,11 +76,11 @@ public class BsSysMenu implements Serializable
 
     /** 显示状态（0显示 1隐藏） */
     @ApiModelProperty(value ="显示状态（1显示 0隐藏）")
-    private int visible;
+    private Integer visible;
 
     /** 菜单状态（0显示 1隐藏） */
     @ApiModelProperty(value ="菜单状态（1显示 0隐藏）")
-    private int status;
+    private Integer status;
 
     /** 权限字符串 */
     @ApiModelProperty(value ="权限标识")

zhongzheng-system/src/main/java/com/zhongzheng/modules/bs/system/domain/BsSysRole.java

@@ -95,6 +95,7 @@ public class BsSysRole implements Serializable
     private String remark;
 
     private String tenantId;
+    private Long companyId;
 
     /**
      * 请求参数

zhongzheng-system/src/main/java/com/zhongzheng/modules/bs/system/service/impl/BsSysMenuServiceImpl.java

@@ -64,8 +64,8 @@ public class BsSysMenuServiceImpl extends ServiceImpl<BsSysMenuMapper, BsSysMenu
         if (BsSysUser.isAdmin(sysUser.getUserName())) {
             menuList = list(new LambdaQueryWrapper<BsSysMenu>()
                     .like(StrUtil.isNotBlank(menu.getMenuName()),BsSysMenu::getMenuName,menu.getMenuName())
-                    .eq(ObjectUtil.isNotEmpty(menu.getVisible()),BsSysMenu::getVisible,menu.getVisible())
-                    .eq(ObjectUtil.isNotEmpty(menu.getStatus()),BsSysMenu::getStatus,menu.getStatus())
+                    .eq(ObjectUtil.isNotNull(menu.getVisible()),BsSysMenu::getVisible,menu.getVisible())
+                    .eq(ObjectUtil.isNotNull(menu.getStatus()),BsSysMenu::getStatus,menu.getStatus())
                     .orderByAsc(BsSysMenu::getParentId)
                     .orderByAsc(BsSysMenu::getOrderNum));
         } else {