1、修复bug

web/src/main/java/com/ibeetl/jlw/web/CourseLabelController.java

@@ -144,10 +144,16 @@ public class CourseLabelController{
         if (coreUser.isUniAdmin()) {
             param.setSeeSelf(true);
         }
+        param.setCourseLabelStatus(1);
+        if (!coreUser.isAdmin()){
+            param.setOrgIdPlural("1,"+coreUser.getOrgId());
+            param.setCourseLabelType("理论课程类");
+        }
+
         List<CourseLabel>list = courseLabelService.getValuesByQueryNotWithPermission(param);
-        list = list.stream()
-                .filter(courseLabel -> SetUtils.hashSet(coreUser.getOrgId(), 1L).contains(courseLabel.getOrgId()) || courseLabel.getOrgId() == null)
-                .collect(Collectors.toList());
+//        list = list.stream()
+//                .filter(courseLabel -> SetUtils.hashSet(coreUser.getOrgId(), 1L).contains(courseLabel.getOrgId()) || courseLabel.getOrgId() == null)
+//                .collect(Collectors.toList());
         return  JsonResult.success(list);
     }
 

web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseController.java

@@ -187,7 +187,7 @@ public class TeacherOpenCourseController{
         if (!coreUser.isAdmin()) {
             condition.setOrgId(coreUser.getOrgId());
         }
-        condition.setTeacherOpenCourseStatus(1);
+//        condition.setTeacherOpenCourseStatus(1);
         teacherOpenCourseService.queryByCondition(page);
         return JsonResult.success(page);
     }

web/src/main/java/com/ibeetl/jlw/web/UniversitiesCollegesController.java

@@ -1,5 +1,6 @@
 package com.ibeetl.jlw.web;
 
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.jlw.Interceptor.SCoreUser;
 import cn.jlw.validate.ValidateConfig;
@@ -161,6 +162,12 @@ public class UniversitiesCollegesController{
         if(result.hasErrors()){
             return JsonResult.failMessage(result);
         }else{
+            if (ObjectUtil.isEmpty(createUserDTO.getUserCode())){
+                return JsonResult.failMessage("用户名不能为空");
+            }
+            if (createUserDTO.getUserCode().length() >12){
+                return JsonResult.failMessage("用户名过长");
+            }
             universitiesColleges.setAddTime(new Date());
             universitiesColleges.setUniversitiesCollegesStatus(1);
             universitiesCollegesService.addAndCreateCoreUser(universitiesColleges, createUserDTO);

web/src/main/java/com/ibeetl/jlw/web/UniversityFacultyController.java

@@ -1,5 +1,6 @@
 package com.ibeetl.jlw.web;
 
+import cn.hutool.core.util.ObjectUtil;
 import cn.jlw.Interceptor.SCoreUser;
 import cn.jlw.validate.ValidateConfig;
 import com.ibeetl.admin.core.annotation.Function;
@@ -160,6 +161,13 @@ public class UniversityFacultyController extends BaseController {
         if(result.hasErrors()){
             return JsonResult.failMessage(result);
         }else{
+            if (ObjectUtil.isEmpty(universityFacultyQuery.getUniversitiesCollegesId())){
+                 return JsonResult.failMessage("请选择院校名称");
+            }
+
+            if (ObjectUtil.isEmpty(universityFacultyQuery.getUniversityFacultyName())){
+                return JsonResult.failMessage("请输入院系名称");
+            }
             UniversitiesColleges universitiesColleges = universitiesCollegesService.queryById(universityFacultyQuery.getUniversitiesCollegesId());
             // 操作人
             universityFacultyQuery.setUserId(coreUser.getId());
@@ -177,6 +185,13 @@ public class UniversityFacultyController extends BaseController {
         if(result.hasErrors()){
             return JsonResult.failMessage(result);
         }else {
+            if (ObjectUtil.isEmpty(universityFacultyQuery.getUniversitiesCollegesId())){
+                return JsonResult.failMessage("请选择院校名称");
+            }
+
+            if (ObjectUtil.isEmpty(universityFacultyQuery.getUniversityFacultyName())){
+                return JsonResult.failMessage("请输入院系名称");
+            }
             universityFacultyQuery.setUserId(null);
             universityFacultyQuery.setOrgId(null);
             String msg = universityFacultyService.edit(universityFacultyQuery);

web/src/main/java/com/ibeetl/jlw/web/UniversitySystemController.java

@@ -1,5 +1,6 @@
 package com.ibeetl.jlw.web;
 
+import cn.hutool.core.util.ObjectUtil;
 import cn.jlw.Interceptor.SCoreUser;
 import cn.jlw.validate.ValidateConfig;
 import com.ibeetl.admin.core.annotation.Function;
@@ -183,6 +184,9 @@ public class UniversitySystemController extends BaseController {
         if(result.hasErrors()){
             return JsonResult.failMessage(result);
         }else{
+            if (ObjectUtil.isEmpty(universitySystemQuery.getUniversitySystemName())){
+                return JsonResult.failMessage("请输入专业名称");
+            }
             UniversityFaculty universityFaculty = facultyService.queryById(universitySystemQuery.getUniversityFacultyId());
             // 操作人
             universitySystemQuery.setUserId(coreUser.getId());

web/src/main/java/com/ibeetl/jlw/web/query/CourseLabelQuery.java

@@ -26,6 +26,8 @@ public class CourseLabelQuery extends PageParam {
     @Query(name = "查看自己和系统分配的")
     private Boolean seeSelf ;
 
+    private String orgIdPlural;
+
     public Long getCourseLabelId(){
         return  courseLabelId;
     }
@@ -89,4 +91,12 @@ public class CourseLabelQuery extends PageParam {
     public void setSeeSelf(Boolean seeSelf) {
         this.seeSelf = seeSelf;
     }
+
+    public String getOrgIdPlural() {
+        return orgIdPlural;
+    }
+
+    public void setOrgIdPlural(String orgIdPlural) {
+        this.orgIdPlural = orgIdPlural;
+    }
 }

web/src/main/java/com/ibeetl/jlw/web/query/StudentQuery.java

@@ -114,6 +114,8 @@ public class StudentQuery extends PageParam {
     private Integer log;
     private Long resourcesApplicationId;
 
+    private Long universityFacultyId;
+
     /**
      * 日志中，查询条件，开始时间
      */
@@ -543,4 +545,12 @@ public class StudentQuery extends PageParam {
     public void setStudentOrName(String studentOrName) {
         this.studentOrName = studentOrName;
     }
+
+    public Long getUniversityFacultyId() {
+        return universityFacultyId;
+    }
+
+    public void setUniversityFacultyId(Long universityFacultyId) {
+        this.universityFacultyId = universityFacultyId;
+    }
 }

web/src/main/resources/sql/jlw/courseLabel.md

@@ -103,4 +103,6 @@ getValuesByQueryNotWithPermission
   @if(!isEmpty(seeSelf) && seeSelf && !isEmpty(userId)){
   and (t.add_type = 'ADMIN_ADD' or t.user_id = #userId#)
   @}
-  
+  @if(!isEmpty(seeSelf)){
+  and FIND_IN_SET(t.org_id,#orgIdPlural#)
+  @} 

web/src/main/resources/sql/jlw/resourcesInfo.md

@@ -400,7 +400,11 @@ getCurriculumResourceManagementList
   UNION ALL
   (
   SELECT
+  @if(!isEmpty(orgId)){
+  (SELECT a.teacher_name FROM teacher a WHERE a.user_id = tb.user_id) AS add_type_text,
+  @}else {
   lbd.`NAME` AS add_type_text,
+  @}
   tb.teacher_open_course_merge_course_info_id AS course_info_id,
   IF(
   ISNULL((

web/src/main/resources/sql/jlw/student.md

@@ -131,6 +131,9 @@ queryByCondition
       @}
       @if(!isEmpty(studentOrName)){
          and (t.student_sn like #'%'+studentOrName+'%'# or t.student_name like #'%'+studentOrName+'%'#)
+      @}  
+      @if(!isEmpty(universityFacultyId)){
+        and bb.university_faculty_id =#universityFacultyId#
       @}
       @if(!isEmpty(competitionId)){
         -- 1只包含参赛学员 2不包含参赛学员