Преглед изворни кода

临时授权查看详情。老师id不使用用户id

mingfu пре 1 месец
родитељ
комит
5a2009c4a8

+ 1 - 1
back-ui/src/views/dz/papers/components/list-exact-intelligent.vue

@@ -37,7 +37,7 @@ const columns = [
     ...consts.config.exactColumns
 ]
 const actions = [
-    {label: '查看详情', key: 'detail', permission: ['']}
+    {label: '查看详情', key: 'detail', permission: ['learn:test:list']}
 ]
 
 const drawer = ref(false)

+ 1 - 1
back-ui/src/views/dz/papers/components/plugs/class-detail.vue

@@ -58,7 +58,7 @@ const columns = [
     {label: '手机号', prop: 'mobile', width: 120}
 ]
 const actions = [
-    {key: 'rate', label: '考试详情', permission: [''], disabled: r => [null, undefined, NaN].includes(r.rate)}
+    {key: 'rate', label: '考试详情', permission: ['learn:test:list'], disabled: r => [null, undefined, NaN].includes(r.rate)}
 ]
 
 const getList = async function() {

+ 2 - 2
ie-admin/src/main/java/com/ruoyi/web/controller/learn/LearnTeacherController.java

@@ -132,7 +132,7 @@ public class LearnTeacherController extends BaseController {
     public TableDataInfo getPaperClassRecords(TestPaperVO.TestPaperBuildReq req)
     {
         startPage();
-        List<JSONObject> list = learnTeacherService.getPaperClassRecords(req, SecurityUtils.getUserId());
+        List<JSONObject> list = learnTeacherService.getPaperClassRecords(req, SecurityUtils.getLoginUser().getUser().getUserTypeId());
         list.stream().forEach(o -> {
             o.put("buildType", req.getBuildType());
         });
@@ -285,7 +285,7 @@ public class LearnTeacherController extends BaseController {
     @ApiOperation("2. 班级列表")
     public AjaxResult classes()
     {
-        return AjaxResult.success(learnTeacherService.getClasses(getUserId()));
+        return AjaxResult.success(learnTeacherService.getClasses(SecurityUtils.getLoginUser().getUser().getUserTypeId()));
     }
 
     @GetMapping("/students")

+ 1 - 2
ie-system/src/main/resources/mapper/dz/DzClassesMapper.xml

@@ -39,8 +39,7 @@
         join `dz_classes` c on ls.`class_id` = c.`class_id`
         JOIN `sys_user` u ON ls.`student_id` = u.`user_id`
         join `learn_test` lt on lt.`year` = #{year} <if test="batchId != null"> and lt.`batch_id` =  #{batchId} </if>
-        LEFT JOIN `learn_test_student` ts ON ts.`student_id` = ls.`student_id`
-            <if test="batchId != null"> and ts.`batch_id` =  #{batchId} </if>
+        LEFT JOIN `learn_test_student` ts ON ts.`student_id` = ls.`student_id` AND ts.`batch_id` = lt.`batch_id`
             <if test="buildType != null"> AND ts.`build_type` = #{buildType} </if>
             <if test="subjectId != null"> and ts.`subject_id` = #{subjectId} </if>
         <where>tc.`teacher_id` = #{teacherId}