diff --git a/web/src/main/java/com/ibeetl/jlw/web/SchoolClassController.java b/web/src/main/java/com/ibeetl/jlw/web/SchoolClassController.java index 38568118..b3ffeeaf 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/SchoolClassController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/SchoolClassController.java @@ -5,6 +5,7 @@ import cn.jlw.validate.ValidateConfig; import com.ibeetl.admin.core.annotation.Function; import com.ibeetl.admin.core.entity.CoreUser; import com.ibeetl.admin.core.file.FileService; +import com.ibeetl.admin.core.service.CorePlatformService; import com.ibeetl.admin.core.web.JsonResult; import com.ibeetl.jlw.entity.SchoolClass; import com.ibeetl.jlw.entity.UniversitiesColleges; @@ -48,7 +49,8 @@ public class SchoolClassController{ @Autowired private UniversitiesCollegesService universitiesCollegesService; @Autowired private UniversitySystemService systemService; - + @Autowired private CorePlatformService corePlatformService; + @Autowired FileService fileService; @@ -154,6 +156,7 @@ public class SchoolClassController{ } schoolClassService.save(schoolClass); + corePlatformService.clearDictCache(); return JsonResult.success(); } } @@ -170,6 +173,7 @@ public class SchoolClassController{ schoolClass.setAddTime(null); boolean success = schoolClassService.updateTemplate(schoolClass); if (success) { + corePlatformService.clearDictCache(); return JsonResult.success(); } else { return JsonResult.failMessage("更新失败"); @@ -199,6 +203,7 @@ public class SchoolClassController{ @ResponseBody public JsonResult delete(String ids) { schoolClassService.deleteSchoolClass(ids); + corePlatformService.clearDictCache(); return JsonResult.success(); } diff --git a/web/src/main/resources/sql/jlw/universityFaculty.md b/web/src/main/resources/sql/jlw/universityFaculty.md index 531dbc6c..003afd65 100644 --- a/web/src/main/resources/sql/jlw/universityFaculty.md +++ b/web/src/main/resources/sql/jlw/universityFaculty.md @@ -7,6 +7,7 @@ queryByCondition t.* @} from university_faculty t + INNER JOIN universities_colleges ta ON ta.universities_colleges_id = t.universities_colleges_id and ta.universities_colleges_status = 1 where 1=1 @//数据权限,该sql语句功能点,如果不考虑数据权限,可以删除此行 and #function("universityFaculty.query")# @@ -63,6 +64,7 @@ queryByConditionQuery t.* @} from university_faculty t + INNER JOIN universities_colleges ta ON ta.universities_colleges_id = t.universities_colleges_id and ta.universities_colleges_status = 1 where 1=1 @if(!isEmpty(universityFacultyId)){ and t.university_faculty_id =#universityFacultyId# diff --git a/web/src/main/resources/static/js/jlw/student/index.js b/web/src/main/resources/static/js/jlw/student/index.js index ede9ad0c..2179e1b7 100644 --- a/web/src/main/resources/static/js/jlw/student/index.js +++ b/web/src/main/resources/static/js/jlw/student/index.js @@ -40,10 +40,16 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) { { field : 'classIdText', title : '所属专业',align: "center", - hide: isSignRole != 1 ? false : true + hide: isSignRole != 1 ? false : true, + templet: function (d) { + if (d.schoolClass) { + return d.schoolClass.universitySystemIdText + } + return ""; + } }, { - field : 'classIdText', + field : 'className', title : '所属班级',align: "center" }, { diff --git a/web/src/main/resources/static/js/jlw/teacher/index.js b/web/src/main/resources/static/js/jlw/teacher/index.js index 9d824efd..8741a275 100644 --- a/web/src/main/resources/static/js/jlw/teacher/index.js +++ b/web/src/main/resources/static/js/jlw/teacher/index.js @@ -27,7 +27,7 @@ layui.define(['form', 'laydate', 'table'], function (exports) { , limit: 10, cols: [[ // 表头 { - field: 'universitiesCollegesIdText', title: '院校名称', align: "center" + field: 'universitiesCollegesName', title: '院校名称', align: "center" }, /*{ field: 'universityFacultyIdText', title: '院系名称', align: "center"