bug修复

src/main/java/com/xjrsoft/module/student/vo/BaseStudentDevelopmentPageVo.java

@@ -58,7 +58,7 @@ public class BaseStudentDevelopmentPageVo {
     * 是否灵活就业(1:是 0:否)
     */
     @ApiModelProperty("工作内容")
-    private Integer workContent;
+    private String workContent;
     /**
     * 是否校企合作单位(1:是 0:否)
     */

src/main/java/com/xjrsoft/module/system/service/impl/MenuServiceImpl.java

@@ -251,6 +251,7 @@ public class MenuServiceImpl extends MPJBaseServiceImpl<MenuMapper, Menu> implem
                 result.add(new MenuVo(){{
                     setTitle(menuGroupSet.getName());
                     setId(menuGroupSet.getId());
+                    setDisplay(0);
                 }});
                 menuUsedMap.put(menuGroupSet.getId(), menuGroupSet.getUseRange());
             }
@@ -262,7 +263,7 @@ public class MenuServiceImpl extends MPJBaseServiceImpl<MenuMapper, Menu> implem
             );
             for (XjrMenuGroup menuGroupMenu : xjrMenuGroupMenu) {
                 menuDisabledMap.put(menuGroupMenu.getXjrMenuId(), 1);
-                if(menuUsedMap.get(menuGroupMenu.getXjrMenuId()) == 2 && managementList.isEmpty()){
+                if(menuUsedMap.get(menuGroupMenu.getXjrMenuId()) != null && menuUsedMap.get(menuGroupMenu.getXjrMenuId()) == 2 && managementList.isEmpty()){
                     menuDisabledMap.put(menuGroupMenu.getXjrMenuId(), 2);
                 }
             }