1、冲突检测

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/TeacherBasicDto.java

@@ -8,6 +8,16 @@ public class TeacherBasicDto {
 
     private String username;
 
+    private Integer organId;
+
+    public Integer getOrganId() {
+        return organId;
+    }
+
+    public void setOrganId(Integer organId) {
+        this.organId = organId;
+    }
+
     public Integer getId() {
         return id;
     }

mec-biz/src/main/resources/config/mybatis/TeacherMapper.xml

@@ -274,9 +274,11 @@
         <result property="id" column="id_"/>
         <result property="username" column="username_"/>
         <result property="realName" column="real_name_"/>
+        <result property="organId" column="organ_id_"/>
     </resultMap>
     <select id="findTeachers" resultMap="TeacherBasicDto">
-        SELECT su.id_,su.username_,su.real_name_ FROM sys_user su
+        SELECT su.id_,su.username_,su.real_name_,t.organ_id_ FROM sys_user su
+        LEFT JOIN teacher t ON su.id_=t.id_
         <where>
             <if test="userIds != null">
                 su.id_ IN