bug修复

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

@@ -231,12 +231,12 @@ public class MenuServiceImpl extends MPJBaseServiceImpl<MenuMapper, Menu> implem
             .select(Menu::getId)
             .select("1 as authorized")
             .selectAs(Subsystem::getName, MenuVo::getSystemName)
-            .selectAs(Department::getName, MenuVo::getDeptName)
-            .selectAs(Department::getId, MenuVo::getDeptId)
+//            .selectAs(Department::getName, MenuVo::getDeptName)
+//            .selectAs(Department::getId, MenuVo::getDeptId)
             .select(Menu.class, x -> VoToColumnUtil.fieldsToColumns(MenuTreeVo.class).contains(x.getProperty()))
             .leftJoin(Subsystem.class, Subsystem::getId, Menu::getSystemId)
-            .leftJoin("xjr_menu_dept_relation t2 ON t2.menu_id = t.id AND t2.delete_mark = 0  ")
-            .leftJoin("xjr_department t3 ON t3.id = t2.dept_id")
+//            .leftJoin("xjr_menu_dept_relation t2 ON t2.menu_id = t.id AND t2.delete_mark = 0")
+//            .leftJoin("xjr_department t3 ON t3.id = t2.dept_id")
             .eq(Menu::getEnabledMark, EnabledMark.ENABLED.getCode())
             .orderByAscStr(orderList)
         );
@@ -292,6 +292,10 @@ public class MenuServiceImpl extends MPJBaseServiceImpl<MenuMapper, Menu> implem
                 }
             }
         }else{
+            for (MenuVo menuVo : menuVos) {
+                menuVo.setDeptId(deptIdMap.get(menuVo.getId()));
+                menuVo.setDeptName(deptNameMap.get(menuVo.getId()));
+            }
             result.addAll(menuVos);
         }
 

src/main/resources/mapper/textbook/TextbookWarehouseRecordMapper.xml

@@ -24,7 +24,7 @@
         FROM textbook_class_relation c1
         LEFT JOIN base_class c2 ON c1.class_id = c2.id
         WHERE c1.textbook_id = t1.textbook_id) AS use_class,
-        t7.name                        AS use_grade
+        t7.name AS use_grade
         FROM textbook_warehouse_record t1
         LEFT JOIN xjr_user t2 ON t1.create_user_id = t2.id
         LEFT JOIN textbook t3 ON t1.textbook_id = t3.id
@@ -50,7 +50,11 @@
             and t3.course_subject_id = #{dto.courseSubjectId}
         </if>
         <if test="dto.classId != null">
-            and t8.class_id = #{dto.classId}
+            and t1.textbook_id in (
+            SELECT textbook_id
+            FROM textbook_class_relation
+            WHERE class_id = #{dto.classId}
+            )
         </if>
         <if test="dto.bookName != null and dto.bookName != ''">
             and t3.book_name like concat('%',#{dto.bookName}, '%')