Merge remote-tracking branch 'origin/dev_v3.2.3' into dev_v3.2.3

distributed-print-business/src/main/resources/db/3.2.3更新脚本-增量.sql

@@ -1219,6 +1219,9 @@ UPDATE sys_privilege
 SET name='列表'
 WHERE id=835;
 
+/*教研分析*/
+ALTER TABLE `sys_org` ADD COLUMN `third_relate_id` INT NULL COMMENT '云阅卷机构ID' AFTER `historic_name`;
+
 /*曹子轩新增*/
 ALTER TABLE `teach_clazz`
     CHANGE COLUMN `teach_course_id` `basic_course_id` BIGINT NOT NULL COMMENT '基础课程主键' ,
@@ -1272,5 +1275,5 @@ ALTER TABLE `basic_operation_log`
 ALTER TABLE `basic_role_data_permission`
     ADD INDEX `role_data_permission_idx` (`role_id` ASC, `privilege_id` ASC) VISIBLE;
 ;
-INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `enable`, `default_auth`, `front_display`) VALUES ('860', '教师团队-根据机构查询', '/api/admin/teach/course/find_teacher_by_org', 'URL', '841', '13', 'AUTH', '1', '1', '1');
-UPDATE `sys_privilege` SET `related` = '77,842,843,844,845,846,847,848,849,850,851,852,853,860' WHERE (`id` = '841');
+INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `enable`, `default_auth`, `front_display`) VALUES ('866', '教师团队-根据机构查询', '/api/admin/teach/course/find_teacher_by_org', 'URL', '841', '13', 'AUTH', '1', '1', '1');
+UPDATE `sys_privilege` SET `related` = '77,842,843,844,845,846,847,848,849,850,851,852,853,866' WHERE (`id` = '841');

teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/impl/SysOrgServiceImpl.java

@@ -472,6 +472,8 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
         }
         SysOrg result = null;
         List<SysOrg> orgList = this.findParentsByOrgId(orgId).stream().distinct().collect(Collectors.toList());
+        // 加上自己
+        orgList.add(this.getById(orgId));
         List<SysOrg> schoolOrgList = orgList.stream().filter(e -> OrgTypeEnum.SCHOOL.equals(e.getType())).collect(Collectors.toList());
         if (schoolOrgList.size() == 1) {
             SysOrg schoolOrg = schoolOrgList.get(0);