bug

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

@@ -170,21 +170,7 @@
         a.teacher_name teacherName,
         a.lecturer_name lecturerName,
         d.name teachingRoomName,
-        CASE
-        WHEN e.status = 'FINISH' THEN 'AUDITED'
-        WHEN e.status = 'AUDITING' THEN 'AUDITING'
-        WHEN
-        e.status IS NOT NULL
-        AND e.status != 'FINISH'
-        AND e.status != 'AUDITING'
-        THEN
-        'NOT_AUDITED'
-        ELSE ''
-        END auditStatus,
-        CASE
-        WHEN a.review_status IS NULL THEN ''
-        ELSE a.review_status
-        END reviewStatus,
+        e.status  auditStatus,
         a.enable,
         a.create_id createId,
         a.create_time createTime,
@@ -259,7 +245,11 @@
         a.status,
         a.flow_id flowId,
         f.setup,
+        f.status as auditStatus,
         f.status as flowStatus,
+        a.teacher_name teacherName,
+        a.lecturer_name lecturerName,
+        so.name teachingRoomName,
         true as myself
         FROM
         exam_task a
@@ -273,6 +263,8 @@
         exam_task_paper_log e ON a.id = e.exam_task_id AND e.review = false
         LEFT JOIN
         t_f_flow_approve f ON a.flow_id = f.flow_id
+        LEFT JOIN
+        sys_org so ON a.teaching_room_id = so.id
         <where>
             a.enable = true
             AND a.review = true
@@ -338,8 +330,12 @@
         a.status,
         a.flow_id flowId,
         f.setup,
+        f.status as auditStatus,
         f.status as flowStatus,
-        false as myself
+        false as myself,
+        a.teacher_name teacherName,
+        a.lecturer_name lecturerName,
+        so.name teachingRoomName
         FROM
         exam_task a
         LEFT JOIN
@@ -352,6 +348,8 @@
         exam_task_paper_log e ON a.id = e.exam_task_id AND e.review = false
         LEFT JOIN
         t_f_flow_approve f ON a.flow_id = f.flow_id
+        LEFT JOIN
+        sys_org so ON a.teaching_room_id = so.id
         <where>
             a.enable = true
             AND a.review = true
@@ -415,6 +413,7 @@
         d.real_name createName,
         a.start_time startTime,
         a.end_time endTime,
+        f.status auditStatus,
         a.review_status reviewStatus,
         a.enable,
         a.create_id createId,
@@ -422,7 +421,10 @@
         a.status,
         a.flow_id flowId,
         f.setup,
-        f.status as flowStatus
+        f.status as flowStatus,
+        a.teacher_name teacherName,
+        a.lecturer_name lecturerName,
+        e.name teachingRoomName
         FROM
         exam_task a
         LEFT JOIN
@@ -435,6 +437,8 @@
         a.flow_id = f.flow_id
         LEFT JOIN t_f_flow_approve_log tffal ON
         a.flow_id = tffal.flow_id
+        LEFT JOIN
+        sys_org e ON a.teaching_room_id = e.id
         <where>
             a.enable = true and a.review = true
             and EXISTS (select distinct t.PROC_INST_ID_ from ACT_HI_TASKINST t where t.TASK_DEF_KEY_ <![CDATA[ <> ]]> 'usertask1' and t.PROC_INST_ID_ = a.flow_id)

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

@@ -106,7 +106,7 @@ public class TeachcloudCommonServiceImpl implements TeachcloudCommonService {
         }
         Set<Long> privilegeIds = sysRolePrivilegeList.stream().map(s -> s.getPrivilegeId()).collect(Collectors.toSet());
         QueryWrapper<SysPrivilege> sysPrivilegeQueryWrapper = new QueryWrapper<>();
-        sysPrivilegeQueryWrapper.lambda().in(SysPrivilege::getId, privilegeIds);
+        sysPrivilegeQueryWrapper.lambda().in(SysPrivilege::getId, privilegeIds).eq(SysPrivilege::getEnable, true);
         List<SysPrivilege> sysPrivilegeList = sysPrivilegeService.list(sysPrivilegeQueryWrapper);
         Gson gson = new Gson();
         List<MenuDto> menuDtoList = gson.fromJson(JacksonUtil.parseJson(sysPrivilegeList), new TypeToken<List<MenuDto>>() {