Sfoglia il codice sorgente

1、班级考核查询调整
2、新闻公告详情页面调整

dzx 1 anno fa
parent
commit
1f1925ef40

+ 1 - 1
src/main/java/com/xjrsoft/module/oa/controller/NewsController.java

@@ -123,7 +123,7 @@ public class NewsController {
     public RT<NewsVo> info(@RequestParam Long id, @RequestParam(required = false) Boolean isRead) {
         News news = newsService.getById(id);
         if (news == null) {
-            RT.error("找不到此新闻!");
+            return RT.error("该内容不存在或已被删除!");
         }
 
         List<NewsRelationVo> newsRelationVoList = new ArrayList<>();

+ 1 - 1
src/main/java/com/xjrsoft/module/oa/controller/ProclamationController.java

@@ -109,7 +109,7 @@ public class ProclamationController {
     public RT<ProclamationVo> info(@RequestParam Long id) {
         ProclamationVo proclamationVo = newsService.getProclamationById(id);
         if (proclamationVo == null) {
-            RT.error("找不到此公告!");
+            return RT.error("该内容不存在或已被删除!");
         }
         return RT.ok(proclamationVo);
     }

+ 2 - 2
src/main/resources/mapper/student/BaseStudentAssessmentInspectionMapper.xml

@@ -15,9 +15,9 @@
         FROM base_student_assessment_inspection t
         LEFT JOIN base_student_assessment_category t1 ON (t1.id = t.base_student_assessment_category_id)
         LEFT JOIN base_student_assessment_project t2 ON (t2.id = t.base_student_assessment_project_id)
-        LEFT JOIN base_semester t3 ON t.base_semester_id=t3.id
+        LEFT JOIN base_semester t3 ON t.base_semester_id = t3.id
         LEFT JOIN base_grade t4 ON t.grade_id = t4.id
-        LEFT JOIN xjr_user t5 ON t.create_user_id = t5.id
+        LEFT JOIN xjr_user t5 ON t.assessment_user_id = t5.id
         LEFT JOIN xjr_dictionary_detail t6 ON t6.code= t.score_type
         WHERE  t.delete_mark = 0 AND t1.delete_mark = 0  AND t2.delete_mark = 0  AND t3.delete_mark = 0
         <if test="dto.projectIds != null and dto.projectIds.size() > 0">