浏览代码

3.4.2 update

xiaofei 6 月之前
父节点
当前提交
2f2355fde6

+ 2 - 1
distributed-print/install/mysql/init/teachcloud_db.sql

@@ -3441,6 +3441,7 @@ 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 (851, '教学学生-从课程班级批量添加学生', '/api/admin/teach/student/create_batch', 'URL', 841, 10, 'AUTH', NULL, 1, 1, 1);
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES (852, '教学学生-批量导入', '/api/admin/teach/student/import', 'URL', 841, 11, 'AUTH', NULL, 1, 1, 1);
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES (853, '教学学生-批量删除', '/api/admin/teach/student/delete', 'URL', 841, 12, 'AUTH', NULL, 1, 1, 1);
+INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES (854, '指定用户添加课程', 'AssginCourseUser', 'BUTTON', '576', '6', 'AUTH', NULL,'1', '0', '1');
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES (856, '查看', 'Preview', 'LINK', 624, 8, 'AUTH', NULL, 1, 0, 1);
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES (860, '共用接口-查询学期', '/api/admin/basic/condition/list_semester', 'URL', 149, 8, 'SYS', NULL, 1, 1, 1);
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES (861, '共用接口-查询考试', '/api/admin/basic/condition/list_exam', 'URL', 149, 9, 'SYS', NULL, 1, 1, 1);
@@ -3604,7 +3605,7 @@ 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 (1108, '列表', 'List', 'LIST', 1100, 2, 'AUTH', '1101', 1, 0, 1);
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES (1109, '新增', 'Add', 'BUTTON', 1100, 4, 'AUTH', '1102', 1, 0, 1);
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES (1110, '编辑', 'Edit', 'LINK', 1100, 5, 'AUTH', '1102', 1, 0, 1);
-INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES (1111, '导入学生', 'Import', 'BUTTON', 1100, 6, 'AUTH', '1103', 1, 0, 1);
+INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES (1111, '导入学生', 'Import', 'BUTTON', 1100, 6, 'AUTH', '157,1103', 1, 0, 1);
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES (1112, '导出学生', 'Export', 'BUTTON', 1100, 7, 'AUTH', '1104', 1, 0, 1);
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES (1113, '删除', 'Delete', 'LINK', 1100, 8, 'AUTH', '1105,1144', 1, 0, 1);
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES (1114, '批量删除', 'DeleteBatch', 'BUTTON', 1100, 9, 'AUTH', '1105,1144', 1, 0, 1);

+ 4 - 1
distributed-print/install/mysql/upgrade/3.4.2.sql

@@ -201,4 +201,7 @@ WHERE id=2006;
 -- 2024-11-27
 INSERT INTO sys_privilege
 (id, name, url, `type`, parent_id, `sequence`, property, related, enable, default_auth, front_display)
-VALUES(1188, '共用接口-OBE专业', '/api/admin/basic/condition/list_professional_all', 'URL', 149, 18, 'SYS', NULL, 1, 1, 1);
+VALUES(1188, '共用接口-OBE专业', '/api/admin/basic/condition/list_professional_all', 'URL', 149, 18, 'SYS', NULL, 1, 1, 1);
+
+INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `enable`, `default_auth`, `front_display`) VALUES ('854', '指定用户添加课程', 'AssginCourseUser', 'BUTTON', '576', '6', 'AUTH', '1', '0', '1');
+UPDATE `sys_privilege` SET `related` = '157,1103' WHERE (`id` = '1111');

+ 5 - 2
distributed-print/src/main/java/com/qmth/distributed/print/api/TeachCourseController.java

@@ -67,7 +67,10 @@ public class TeachCourseController {
         }
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
         teachCourseSelectParam.setSchoolId(sysUser.getSchoolId());
-        teachCourseSelectParam.setUserId(sysUser.getId());
+        // 前端不选老师时,默认加给自己
+        if (teachCourseSelectParam.getUserId() == null) {
+            teachCourseSelectParam.setUserId(sysUser.getId());
+        }
         teachCourseService.selectCreate(teachCourseSelectParam);
         return ResultUtil.ok();
     }
@@ -83,7 +86,7 @@ public class TeachCourseController {
     @ApiOperation(value = "教学课程-批量删除")
     @RequestMapping(value = "/delete", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "删除成功", response = EditResult.class)})
-    @OperationLogDetail(operationType = OperationTypeEnum.DELETE,detail = "删除操作,教学课程ID:[{{idList}}]")
+    @OperationLogDetail(operationType = OperationTypeEnum.DELETE, detail = "删除操作,教学课程ID:[{{idList}}]")
     public Result deleteTeachCourse(@ApiParam(value = "选择的要删除的课程id集合", required = true) @RequestParam List<String> idList) {
         teachCourseService.deleteTeachCourseBatch(
                 idList.stream().map(SystemConstant::convertIdToLong).collect(Collectors.toList()));