增加是否任课教师字段

src/main/java/com/xjrsoft/module/organization/controller/UserController.java

@@ -186,6 +186,7 @@ public class UserController {
                     .eq(ObjectUtil.isNotNull(dto.getEmployWay()), BaseTeacher::getEmployWay, dto.getEmployWay())
                     .eq(ObjectUtil.isNotNull(dto.getClassId()), BaseStudentSchoolRoll::getClassId, dto.getClassId())
                     .eq(ObjectUtil.isNotNull(dto.getRoleId()), UserRoleRelation::getRoleId, dto.getRoleId())
+                    .eq(ObjectUtil.isNotNull(dto.getIsTeach()), BaseTeacherRegular::getIsTeach, dto.getIsTeach())
                     .orderByDesc(User::getId)
                     .select(User::getId)
                     .select("d1.name", UserPageVo::getEmployWay)

src/main/java/com/xjrsoft/module/organization/dto/UserPageDto.java

@@ -49,4 +49,7 @@ public class UserPageDto extends PageInput {
 
     @ApiModelProperty("教学状态")
     private String teachingStatus;
+
+    @ApiModelProperty("是否任教(1:是 0:否)")
+    private Integer isTeach;
 }

src/main/java/com/xjrsoft/module/teacher/dto/AddBaseTeacherRegularDto.java

@@ -67,4 +67,7 @@ public class AddBaseTeacherRegularDto implements Serializable {
     @ApiModelProperty("任教学科(base_course_subject)")
     private Long courseSubjectId;
 
+    @ApiModelProperty("是否任课老师(1:是 0:否)")
+    private Integer isTeach;
+
 }

src/main/java/com/xjrsoft/module/teacher/dto/UpdateBaseTeacherRegularDto.java

@@ -72,4 +72,7 @@ public class UpdateBaseTeacherRegularDto implements Serializable {
     @ApiModelProperty("任教学科(base_course_subject)")
     private Long courseSubjectId;
 
+    @ApiModelProperty("是否任课老师(1:是 0:否)")
+    private Integer isTeach;
+
 }

src/main/java/com/xjrsoft/module/teacher/entity/BaseTeacherRegular.java

@@ -116,4 +116,8 @@ public class BaseTeacherRegular implements Serializable {
      */
     @ApiModelProperty("任教学科(base_course_subject)")
     private Long courseSubjectId;
+
+
+    @ApiModelProperty("是否任课老师(1:是 0:否)")
+    private Integer isTeach;
 }

src/main/resources/application-pre.yml

@@ -115,8 +115,8 @@ xjrsoft:
     secret1: z3R17Od4ROW1zPisguiQmTfx0NvcYKmoIu19-82vdtU
     agentid: 1000003
   mpWeChat:
-    appKey: wxfeafb4ef984a4282
-    appSecret: bad871713dd2d9c0bbf8f813eebcacbc
+    appKey: wx93175d7fe68cd170
+    appSecret: 4bab1c5ccd9d4d1d7854464d7251becf
   weChatMessageTemplate:
     commonTemplate: qmpXORPM1Cocqn503Qa4OkNNQ0uxlj2-ed9m6uWO-v4
     assessmentTemplate: ehYfXni7exZUmt6dJX4Ukbm9ETarFfKLfXVYwNnjKMc