Răsfoiți Sursa

考试阅卷部门,指定部门,课程学习部门修复

yangfeng 1 an în urmă
părinte
comite
2e0b312f17

+ 0 - 9
web/src/main/java/com/ynfy/buss/course/course/service/impl/CourseServiceImpl.java

@@ -60,15 +60,6 @@ public class CourseServiceImpl extends ServiceImpl<CourseMapper, Course> impleme
      */
     @Override
     public IPage<Course> selectCourseList(IPage<Course> page, Course course, LoginUser user) {
-        if (StringUtils.isNotBlank(course.getName())) {
-            course.setName(course.getName().replace("*", ""));
-        }
-        if (!Objects.isNull(user) && StringUtils.isNotBlank(user.getOrgCode())) {
-            SysDepart depart = sysDepartService.queryByOrgCode(user.getOrgCode());
-            if (!Objects.isNull(depart)) {
-                user.setOrgCode(depart.getId());
-            }
-        }
         return courseMapper.selectCourseList(page, course, user);
     }
 

+ 8 - 8
web/src/main/java/com/ynfy/buss/exam/exam/mapper/xml/ExamMapper.xml

@@ -121,19 +121,19 @@
         ) tmp1
         <choose>
             <when test="user!=null and user.id!=null and user.id!=''">
-                LEFT JOIN (
-                SELECT
+        LEFT JOIN (
+            SELECT
                 exam_id,
                 COUNT(*) AS try_count
-                FROM
+            FROM
                 user_exam uer
-                WHERE
+            WHERE
                 uer.user_id = #{user.id}
-                GROUP BY
+            GROUP BY
                 exam_id
-                ) tmp2
-                ON tmp1.ID = tmp2.exam_id
-                LEFT JOIN user_exam_result u on u.exam_id = tmp2.exam_id and u.user_id = #{user.id}
+            ) tmp2
+            ON tmp1.ID = tmp2.exam_id
+            LEFT JOIN user_exam_result u on u.exam_id = tmp2.exam_id and u.user_id = #{user.id}
             </when>
         </choose>
         <where>

+ 0 - 9
web/src/main/java/com/ynfy/buss/exam/exam/service/impl/ExamServiceImpl.java

@@ -105,15 +105,6 @@ public class ExamServiceImpl extends ServiceImpl<ExamMapper, Exam> implements IE
      */
     @Override
     public IPage<Exam> selectExamList(IPage<Exam> page, Exam exam, LoginUser user) {
-        if (!Objects.isNull(exam) && StringUtils.isNotBlank(exam.getTitle())) {
-            exam.setTitle(exam.getTitle().replace("*", ""));
-        }
-        if (!Objects.isNull(user) && StringUtils.isNotBlank(user.getOrgCode())) {
-            SysDepart depart = sysDepartService.queryByOrgCode(user.getOrgCode());
-            if (!Objects.isNull(depart)) {
-                user.setOrgCode(depart.getId());
-            }
-        }
         return examMapper.selectExamList(page, exam, user);
     }