课表调整

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

@@ -266,9 +266,9 @@ public class MenuServiceImpl extends MPJBaseServiceImpl<MenuMapper, Menu> implem
                             .eq(WhitelistManagement::getUserId, StpUtil.getLoginIdAsLong())
             );
             for (XjrMenuGroup menuGroupMenu : xjrMenuGroupMenu) {
-                menuDisabledMap.put(menuGroupMenu.getXjrMenuId(), 1);
-                if(menuUsedMap.get(menuGroupMenu.getXjrMenuId()) != null && menuUsedMap.get(menuGroupMenu.getXjrMenuId()) == 2 && managementList.isEmpty()){
-                    menuDisabledMap.put(menuGroupMenu.getXjrMenuId(), 2);
+                menuDisabledMap.put(menuGroupMenu.getXjrMenuId(), 0);
+                if(menuUsedMap.get(menuGroupMenu.getXjrMenuGroupSetId()) != null && menuUsedMap.get(menuGroupMenu.getXjrMenuGroupSetId()) == 2 && managementList.isEmpty()){
+                    menuDisabledMap.put(menuGroupMenu.getXjrMenuId(), 1);
                 }
             }
             for (MenuVo menuVo : menuVos) {

src/main/java/com/xjrsoft/module/textbook/service/impl/WfTextbookSubscriptionServiceImpl.java

@@ -404,12 +404,10 @@ public class WfTextbookSubscriptionServiceImpl extends MPJBaseServiceImpl<WfText
                         item -> item
                 ));
 
-        Map<String, WfTextbookSubscriptionItem> itemByIssnMap = wfTextbookSubscriptionItemList
-                .stream()
-                .collect(Collectors.toMap(
-                        WfTextbookSubscriptionItem::getIssn,
-                        item -> item
-                ));
+        Map<String, WfTextbookSubscriptionItem> itemByIssnMap = new HashMap<>();
+        for (WfTextbookSubscriptionItem el : wfTextbookSubscriptionItemList) {
+            itemByIssnMap.put(el.getIssn(), el);
+        }
 
         Date now = new Date();
         Long loginId = StpUtil.getLoginIdAsLong();