新增系统内置角色

teachcloud-common/src/main/java/com/qmth/teachcloud/common/enums/RoleTypeEnum.java

@@ -18,7 +18,9 @@ public enum RoleTypeEnum {
     MARKER("评卷员"),
     MARKER_LEADER("科组长"),
     SUBJECT_TEACHER("学科老师"),
-    ASSIGN_TEACHER("命题老师");
+    ASSIGN_TEACHER("命题老师"),
+    SCHOOL_TEACHER("学校老师"),
+    ASSISTANT("学院秘书");
 
     RoleTypeEnum(String desc) {
         this.desc = desc;

teachcloud-common/src/main/resources/mapper/SysRoleMapper.xml

@@ -60,6 +60,9 @@
             <if test="enable != null and enable != '' or enable == 0">
                 and t.enable = #{enable}
             </if>
+        union
+        <include refid="Base_Column_List" />
+        where t.default_role = 1 and (t.type = 'SCHOOL_ADMIN' or t.type = 'SCHOOL_TEACHER' or t.type = 'ASSISTANT')
             ) t
         ORDER BY t.create_time
     </select>
@@ -78,5 +81,8 @@
         <if test="schoolId != null and schoolId != ''">
             and tsr.school_id = #{schoolId}
         </if>
+        union
+        <include refid="Base_Column_List" />
+        where t.default_role = 1 and (t.type = 'SCHOOL_ADMIN' or t.type = 'SCHOOL_TEACHER' or t.type = 'ASSISTANT')
     </select>
 </mapper>