Merge remote-tracking branch 'origin/dev' into dev

web-app/src/main/java/com/zcloud/edu/command/resource/CurriculumUpdateExe.java

@@ -144,8 +144,15 @@ public class CurriculumUpdateExe {
                     errorList.add(curriculumDO.getCurriculumName()+"课程已绑定班级");
                 }
             }
-            //判断是否是本人创建的
-            if(!AuthContext.getUserId().equals(curriculumDO.getCreateId())){
+
+            //如果是企业，可以看本企业下所有的，如果是个人，只能看个人的，判断登录的账号是企业主账号还是个人
+            Boolean isCorpAccount = corpInfoRepository.checkCorp();
+            // 企业账户：检查租户ID匹配
+            if (isCorpAccount && !AuthContext.getTenantId().equals(curriculumDO.getTenantId())) {
+                errorList.add(curriculumDO.getCurriculumName()+"课程不是本企业的");
+            }
+            // 个人账户：检查创建者ID匹配
+            if (!isCorpAccount && curriculumDO.getCreateId().equals(AuthContext.getUserId())) {
                 errorList.add(curriculumDO.getCurriculumName()+"课程不是本人创建的");
             }
 

web-infrastructure/src/main/resources/mapper/CurriculumMapper.xml

@@ -44,7 +44,7 @@
             </if>
 
         group by c.id
-        order by c.create_time asc
+        order by c.create_time desc
     </select>
 
     <select id="getInfoById" resultType="com.zcloud.edu.persistence.dataobject.CurriculumDO">