bug fix

distributed-print-business/src/main/resources/mapper/ConditionMapper.xml

@@ -257,7 +257,7 @@
                 AND et.course_code = bc.code
                 LEFT JOIN
             teach_course tc ON bc.school_id = tc.school_id
-                AND bc.id = tc.basic_course_id
+                AND bc.code = tc.course_code
         <where>
             <if test="semesterId != null">
                 AND tsess.semester_id = #{semesterId}

distributed-print-business/src/main/resources/mapper/TeachCourseMapper.xml

@@ -102,7 +102,7 @@
                     FROM
                         teach_course tc
                     WHERE
-                        bc.id = tc.basic_course_id
+                        tc.school_id = bc.school_id and bc.code = tc.course_code
                       AND tc.user_id = #{userId})
     </select>
 </mapper>

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

@@ -173,7 +173,7 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
             // 机构代码为空，若为一级学院，则自动生成code
 //            else {
 //                SysOrg sysOrgRoot = this.getOne(new QueryWrapper<SysOrg>().lambda().eq(SysOrg::getSchoolId, schoolId).eq(SysOrg::getType, OrgTypeEnum.SCHOOL));
-                // 学校下第一级机构，自动生成code
+            // 学校下第一级机构，自动生成code
 //                if (sysOrgRoot != null && org.getParentId().equals(sysOrgRoot.getId())) {
 //                    Integer maxOrgCode = commonCacheService.getMaxOrgCode(schoolId);
 //                    Integer currentCode = maxOrgCode + 1;

teachcloud-common/src/main/resources/mapper/SysUserMapper.xml

@@ -458,15 +458,11 @@
             so.code as orgCode
         from
             sys_user su
-                join sys_org so on
-                so.id = su.org_id
-                join sys_user_role sur on
-                sur.user_id = su.id
-                join sys_role sr on
-                sr.id = sur.role_id
-                join teach_course tc on
-                tc.user_id = su.id
-                join basic_course bc on bc.id = tc.basic_course_id
+            join sys_org so on so.id = su.org_id
+            join sys_user_role sur on sur.user_id = su.id
+            join sys_role sr on sr.id = sur.role_id
+            join teach_course tc on tc.user_id = su.id
+            join basic_course bc on tc.school_id = bc.school_id AND bc.code = tc.course_code
         <where>
             <if test="schoolId != null and schoolId != ''">
                 and tc.school_id = #{schoolId}