瀏覽代碼

1.0.4 优化联调bug

xiaofei 1 年之前
父節點
當前提交
4e6b5e8418

+ 3 - 0
paper-library-business/src/main/java/com/qmth/paper/library/business/service/impl/BasicExamServiceImpl.java

@@ -37,10 +37,13 @@ public class BasicExamServiceImpl extends ServiceImpl<BasicExamMapper, BasicExam
 
     @Override
     public IPage<BasicExam> pageData(Long semesterId, Integer pageNumber, Integer pageSize) {
+        Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         QueryWrapper<BasicExam> queryWrapper = new QueryWrapper<>();
         LambdaQueryWrapper<BasicExam> lambda = queryWrapper.lambda();
         if (semesterId != null) {
             lambda.eq(BasicExam::getSemesterId, semesterId);
+        } else {
+            lambda.eq(BasicExam::getSchoolId, schoolId);
         }
         lambda.orderByAsc(BasicExam::getCreateTime);
         Page<BasicExam> basicExamPage = this.baseMapper.selectPage(new Page<>(pageNumber, pageSize), queryWrapper);

+ 3 - 1
paper-library/install/mysql/init/paper_library_db.sql

@@ -300,12 +300,13 @@ INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES (10, '列表', 'List', 'LIST', 9, 1, 'AUTH', '15', 1, 0, 1);
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES (11, '新增', 'Add', 'BUTTON', 9, 2, 'AUTH', '16', 1, 0, 1);
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES (12, '编辑', 'Edit', 'LINK', 9, 3, 'AUTH', '16', 1, 0, 1);
-INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES (13, '查询条件', 'Condition', 'LINK', 9, 4, 'AUTH', '15', 1, 0, 1);
+INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES (13, '查询条件', 'Condition', 'CONDITION', 9, 4, 'AUTH', '15', 1, 0, 1);
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES (14, '删除', 'Delete', 'LINK', 9, 5, 'AUTH', '17', 1, 0, 1);
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES (15, '查询接口', '/api/admin/basic/exam/page', 'URL', 9, 1, 'AUTH', NULL, 1, 1, 1);
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES (16, '新增/编辑接口', '/api/admin/basic/exam/save', 'URL', 9, 2, 'AUTH', NULL, 1, 1, 1);
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES (17, '删除接口', '/api/admin/basic/exam/delete', 'URL', 9, 3, 'AUTH', NULL, 1, 1, 1);
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES (18, '文档管理', 'doc', 'MENU', 1, 4, NULL, NULL, 1, 0, 1);
+INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES (19, '查询', 'Select', 'BUTTON', 9, 3, 'AUTH', '15', 1, 0, 1);
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES (20, '考生管理', 'StudentManage', 'MENU', 8, 4, NULL, NULL, 1, 0, 1);
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES (21, '列表', 'List', 'LIST', 20, 1, 'AUTH', '29', 1, 0, 1);
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES (22, '查询条件', 'Condition', 'CONDITION', 20, 2, 'AUTH', '29', 1, 0, 1);
@@ -574,6 +575,7 @@ INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VAL
 INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1768554547992567811, 2, 16, 1);
 INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1768554541111111811, 2, 17, 1);
 INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1768554547992567812, 2, 18, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1780435215978655746, 2, 19, 1);
 INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1768554547992567813, 2, 20, 1);
 INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1768554547992567814, 2, 533, 1);
 INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES (1768554547992567815, 2, 21, 1);